Commit graph

44 commits

Author SHA1 Message Date
UbitUmarov
15efd8f673 mantis 8976: add a few things to gitignore 2022-03-15 15:56:10 +00:00
UbitUmarov
872d9e22df make some changes 2020-10-16 17:32:35 +01:00
Skyler Clark
c71ea23bf5 adds OpenSim.ini to the gitignore and updates build instructions
Signed-off-by: Skyler Clark <wgahnagl@protonmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2020-10-16 17:06:10 +01:00
Melanie
b1d7d2a625 Debugging for impersonation 2020-01-31 15:28:40 +00:00
AliciaRaven
077cfdf698 Update gitignore to include VS user config folder and remove old FxCop file which is not used 2016-11-11 22:05:48 +00:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Oren Hurvitz
0b5385ffce Added *.Tests.log to .gitignore 2015-08-11 11:55:51 +03:00
Geir Nøklebye
1de8c3570d PGSQL migrations for IM_Store, UserProfiles, removal of casting exception for UserProfiles and adding double precision to PGSQL Manager
PGSQL migrations for IM_Store, UserProfiles, removal of casting
exception for UserProfiles and adding double precision to PGSQL Manager.

Fixes the Offline IM to Email toggle and prepares for fixing Offline
IM.

Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-07-31 15:57:22 +01:00
Oren Hurvitz
b94df58891 Git-ignore log files and console history files 2015-07-23 11:47:09 +03:00
Oren Hurvitz
11031abf26 Changed the default XBakes directory to a local path: "./bakes".
Previously it was an absolute path. Now it's a sibling of the maptiles directory.

This fixes http://opensimulator.org/mantis/view.php?id=7063
2014-07-21 09:27:47 +01:00
Melanie
3589acdab1 Merge branch 'master' into careminster
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
b58a474105 Ignore *.suo and *.user as these are user specific preference files from Visual Studio
http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
2013-11-16 00:21:12 +00:00
Justin Clark-Casey (justincc)
92fbe675b5 minor: Add OpenSim.v11.suo to .gitignore file.
This is generated if a vs2010 OpenSim.sln is loaded into vs2012
As per http://opensimulator.org/mantis/view.php?id=6839
2013-11-16 00:05:49 +00:00
Melanie
e62b14024f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-04 22:39:07 +00:00
SignpostMarv
4364d48817 updating config properties added during upgrade process, adding error log file to doxygen config, adding doxygen output directory & error log to .gitignore 2013-01-03 00:17:24 +00:00
Melanie
924df14c5e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
BlueWall
0a71e3ab39 Add file to .gitignore
Add OpenSim.userprefs which is created by Monodevelop to .gitignore
2012-09-06 05:36:00 -04:00
Melanie
899337b4a0 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-29 03:31:13 +01:00
SignpostMarv
8a7fbfb06a adding some files to .gitignore that get generated when debugging in c# express with OpenSim.32BitLaunch as the startup project 2012-08-27 23:48:29 +01:00
Melanie
007a45aa76 Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster 2012-08-25 18:08:10 +01:00
SignpostMarv
632908db9e adding sqlite journal files to .gitignore 2012-08-24 01:26:11 +01:00
Melanie
771d79e83e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
2012-07-28 00:39:36 +01:00
SignpostMarv
b23ab3ea85 adding asset cache and map tile directories to .gitignore 2012-07-27 23:37:24 +01:00
Melanie
6a96c9546d Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
BlueWall
66bdd20628 Add some things to .gitignore to make the status cleaner 2011-10-26 08:33:17 -04:00
Kitto Flora
7ab103c96f Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only. 2010-07-13 20:37:13 +00:00
AlexRa
b9c6ee6eb2 removed from git *.VisualState.xml (automatically created by NUnit) 2010-04-28 11:41:39 +03:00
AlexRa
0718748ea4 Removed from git .../obj directories (created by VStudio) 2010-04-28 11:41:22 +03:00
dr scofield (aka dirk husemann)
7796033f0d additional log files to ignore, also ignoring TestResult.xml 2009-09-09 09:56:07 +02:00
Jeff Ames
b324f88f86 Add UUIDs in bin/ScriptEngines to .gitignore. 2009-08-17 10:23:57 +09:00
Jeff Ames
eedb155502 Thanks jonc for a patch to ignore some Visual Studio and generated ini files. 2009-08-12 12:32:49 +09:00
Chris Down
bb64906a9c Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
git log -n 1 --pretty="format:%h: %ci" > bin/.version

This command can also be run manually to create the bin/.version file.

This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H

The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
Sean Dague
115a552ade ignore .svn directories, useful for the mirror 2009-08-07 13:29:42 -04:00
Jeff Ames
123884aefe Add bin/*.db and bin/*.ini to .gitignore. 2009-07-11 11:47:22 +00:00
Dr Scofield
762703852e - adding Makefile.local to .gitignore 2009-04-14 12:17:34 +00:00
Dr Scofield
2c4ccc2347 adding bin/ScriptEngines/*/*.{dll,state}, bin/j2kDecodeCache,
bin/UserAssets to .gitignore
2009-02-09 09:02:49 +00:00
Dr Scofield
40f32756cf adding TAGS to .gitignore 2009-01-22 16:04:31 +00:00
Homer Horwitz
b0e55577ff Revert the rest of r7468 2008-11-25 18:59:10 +00:00
Homer Horwitz
72c28c5120 Local changes 2008-11-25 18:39:36 +00:00
Sean Dague
409e7262df Mid-work, trying to fix region part insertion and retrieval
SQLite reports System NUll Reference, but works, inside
LoadItems, on SQLiteRegionData.cs

From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
2008-10-30 12:56:04 +00:00
Sean Dague
50180984fa - Inserted code coverage monocov. To run do nant test-cov.
Creates a new directory cov and exports to html files in
  subdirectories.
2008-10-22 17:45:43 +00:00
Sean Dague
a27352010a Merge commit 'arthur/master' 2008-10-14 19:00:43 +00:00
Sean Dague
a61cc1fcac add pidb files to gitignore 2008-07-16 15:19:10 +00:00
Sean Dague
de42154b62 added .gitignore which makes using git-svn easier 2008-07-09 23:59:53 +00:00