From 7ab103c96f3e82cac592f20d61358e1928da8e27 Mon Sep 17 00:00:00 2001 From: Kitto Flora Date: Tue, 13 Jul 2010 20:37:13 +0000 Subject: Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 8d3f2b2..e2bef71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .project .settings +.gitignore *.csproj *.csproj.user *.build @@ -10,6 +11,7 @@ *.pidb *.dll.build *.dll +*.log *.VisualState.xml */*/obj */*/*/obj @@ -23,6 +25,7 @@ */*/*/*/*/bin */*/*/*/*/*/bin */*/*/*/*/*/*/bin +addon-modules/ bin/Debug/*.dll bin/*.dll.mdb bin/*.db -- cgit v1.1 From 4364d48817fbc003354101a9fbb84e225c7efe9a Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Mon, 29 Oct 2012 11:16:35 +0000 Subject: updating config properties added during upgrade process, adding error log file to doxygen config, adding doxygen output directory & error log to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 39a8333..f0a5487 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,5 @@ OpenSim/Region/ScriptEngine/test-results/ OpenSim/Tests/Common/test-results/ OpenSim/Tests/test-results/ test-results/ +doc/html +doc/doxygen.error.log -- cgit v1.1 From 92fbe675b58bf03ecd14b9244e044d9df9bb016b Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 16 Nov 2013 00:05:49 +0000 Subject: 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 --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f0a5487..fce3a05 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,10 @@ Examples/*.dll OpenSim.build OpenSim.sln OpenSim.suo + +# This is generated if a vs2010 OpenSim.sln is loaded into vs2012 +OpenSim.v11.suo + OpenSim.userprefs Prebuild/Prebuild.build Prebuild/Prebuild.sln -- cgit v1.1 From b58a4741051cd4745049d06455925c7e1c9f2142 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 16 Nov 2013 00:21:12 +0000 Subject: 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 --- .gitignore | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index fce3a05..aa3e024 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,12 @@ *.pidb *.dll.build *.dll + +# Ignore .user and .suo files as these are user preference specific +# http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control +*.suo +*.user + *.VisualState.xml */*/obj */*/*/obj @@ -65,11 +71,6 @@ bin/crashes/ Examples/*.dll OpenSim.build OpenSim.sln -OpenSim.suo - -# This is generated if a vs2010 OpenSim.sln is loaded into vs2012 -OpenSim.v11.suo - OpenSim.userprefs Prebuild/Prebuild.build Prebuild/Prebuild.sln -- cgit v1.1 From 11031abf263eb5bf25feefef04f770a55e2c0128 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Mon, 14 Jul 2014 10:55:13 +0300 Subject: 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 --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index aa3e024..b495ed1 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ bin/Regions/* bin/UserAssets bin/assetcache bin/maptiles +bin/bakes bin/estate_settings.xml bin/config-include/CenomeCache.ini bin/config-include/FlotsamCache.ini -- cgit v1.1 From b94df5889157741ef48f75b1876070f67bf4ac08 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Thu, 23 Jul 2015 11:47:09 +0300 Subject: Git-ignore log files and console history files --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b495ed1..ae452ec 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,11 @@ bin/OpenSim.Grid.InventoryServer.log bin/OpenSim.Grid.MessagingServer.log bin/OpenSim.Grid.UserServer.log bin/OpenSim.log +bin/OpenSimStats.log +bin/Robust.log +bin/RobustStats.log +bin/OpenSimConsoleHistory.txt +bin/RobustConsoleHistory.txt bin/*.manifest bin/crashes/ Examples/*.dll -- cgit v1.1 From 1de8c3570d0c8d18c181286334de81bf436dfbb4 Mon Sep 17 00:00:00 2001 From: Geir Nøklebye Date: Mon, 27 Jul 2015 14:25:28 +0200 Subject: 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 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index ae452ec..1ddfd3a 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,5 @@ OpenSim/Tests/test-results/ test-results/ doc/html doc/doxygen.error.log + +*.patch -- cgit v1.1 From 0b5385ffcebdf0d0993aee169ebd0ef37bcbfc9c Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Tue, 11 Aug 2015 11:55:51 +0300 Subject: Added *.Tests.log to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1ddfd3a..94f896d 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ bin/Robust.log bin/RobustStats.log bin/OpenSimConsoleHistory.txt bin/RobustConsoleHistory.txt +bin/*.Tests.log bin/*.manifest bin/crashes/ Examples/*.dll -- cgit v1.1 From 077cfdf698b2f769f3e136a779e1b1e108d1b8ed Mon Sep 17 00:00:00 2001 From: AliciaRaven Date: Fri, 11 Nov 2016 22:05:48 +0000 Subject: Update gitignore to include VS user config folder and remove old FxCop file which is not used --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d1f7710..f77d9f9 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ */*/*/*/*/bin */*/*/*/*/*/bin */*/*/*/*/*/*/bin +.vs/ addon-modules/ bin/Debug/*.dll bin/*.dll.mdb @@ -93,7 +94,6 @@ TAGS Makefile.local bin/.version compile.bat -addon-modules OpenSim/Data/Tests/test-results/ OpenSim/Framework/Serialization/Tests/test-results/ OpenSim/Framework/Servers/Tests/test-results/ -- cgit v1.1 From 1497994a565efb930e9541b2ce3e5c061cade329 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 8 Sep 2020 21:39:21 +1000 Subject: Ignore the SledjChisl log. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f77d9f9..f7dc016 100644 --- a/.gitignore +++ b/.gitignore @@ -113,4 +113,6 @@ test-results/ doc/html doc/doxygen.error.log +src/log.txt + *.patch -- cgit v1.1 From ac406d1701bcb0bbbfbc7f44810466613c4a8264 Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 10 Sep 2020 21:16:32 +1000 Subject: Clean up .gitignore --- .gitignore | 69 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 32 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f7dc016..524a92c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .project .settings -.gitignore +lastBuild +#.gitignore *.csproj *.csproj.user *.build @@ -32,51 +33,51 @@ */*/*/*/*/*/bin */*/*/*/*/*/*/bin .vs/ -addon-modules/ +#addon-modules/ bin/Debug/*.dll bin/*.dll.mdb -bin/*.db -bin/*.db-journal -bin/addin-db-* +#bin/*.db +#bin/*.db-journal +#bin/addin-db-* bin/*.dll bin/OpenSim.vshost.exe.config bin/OpenSim.32BitLaunch.vshost.exe.config -bin/OpenSim.32BitLaunch.log +#bin/OpenSim.32BitLaunch.log UpgradeLog.XML _UpgradeReport_Files/ -bin/ScriptEngines/*-*-*-*-* -bin/ScriptEngines/*.dll -bin/ScriptEngines/*/*.dll -bin/ScriptEngines/*/*.state +#bin/ScriptEngines/*-*-*-*-* +#bin/ScriptEngines/*.dll +#bin/ScriptEngines/*/*.dll +#bin/ScriptEngines/*/*.state bin/*.maddin bin/*.exe -bin/*.ini -bin/j2kDecodeCache +#bin/*.ini +#bin/j2kDecodeCache bin/Physics* bin/Terrain* -bin/Regions/* +#bin/Regions/* bin/UserAssets -bin/assetcache -bin/maptiles +#bin/assetcache +#bin/maptiles bin/bakes bin/estate_settings.xml -bin/config-include/CenomeCache.ini -bin/config-include/FlotsamCache.ini -bin/config-include/GridCommon.ini -bin/config-include/StandaloneCommon.ini -bin/OpenSim.Grid.AssetInventoryServer.log -bin/OpenSim.Grid.AssetServer.log -bin/OpenSim.Grid.GridServer.log -bin/OpenSim.Grid.InventoryServer.log -bin/OpenSim.Grid.MessagingServer.log -bin/OpenSim.Grid.UserServer.log -bin/OpenSim.log -bin/OpenSimStats.log -bin/Robust.log -bin/RobustStats.log -bin/OpenSimConsoleHistory.txt -bin/RobustConsoleHistory.txt -bin/*.Tests.log +#bin/config-include/CenomeCache.ini +#bin/config-include/FlotsamCache.ini +#bin/config-include/GridCommon.ini +#bin/config-include/StandaloneCommon.ini +#bin/OpenSim.Grid.AssetInventoryServer.log +#bin/OpenSim.Grid.AssetServer.log +#bin/OpenSim.Grid.GridServer.log +#bin/OpenSim.Grid.InventoryServer.log +#bin/OpenSim.Grid.MessagingServer.log +#bin/OpenSim.Grid.UserServer.log +#bin/OpenSim.log +#bin/OpenSimStats.log +#bin/Robust.log +#bin/RobustStats.log +#bin/OpenSimConsoleHistory.txt +#bin/RobustConsoleHistory.txt +#bin/*.Tests.log bin/*.manifest bin/crashes/ Examples/*.dll @@ -116,3 +117,7 @@ doc/doxygen.error.log src/log.txt *.patch + +git-sub-modules/*/ +src/git-sub-modules/*/ +src/build -- cgit v1.1 From 4db4c3699b764dfe55a25b1d97d6bc6793206b70 Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 7 Jul 2021 12:47:08 +1000 Subject: More git ignores. --- .gitignore | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 524a92c..70e9e57 100644 --- a/.gitignore +++ b/.gitignore @@ -116,8 +116,11 @@ doc/doxygen.error.log src/log.txt -*.patch - git-sub-modules/*/ src/git-sub-modules/*/ src/build +/bin/addin-db-001 +/bin/addin-db-002 +/bin/addin-db-003 +/bin/addin-db-004 +/bin/sledjchisl -- cgit v1.1