1 files changed, 6 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore
index 21f3d45..cec33fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,7 @@
-/config/sim_skeleton/stop-sim
-/config/sim_skeleton/start-sim
-/config/sim_skeleton/common.sh
-/config/sim_skeleton/backup-sim
-/config/ROBUST/stop-sim
-/config/ROBUST/start-sim
-/config/ROBUST/common.sh
-/config/Robust.ini
 .project
 .settings
+lastBuild
+#.gitignore
 *.csproj
 *.csproj.user
 *.build
@@ -18,6 +12,7 @@
 *.pidb
 *.dll.build
 *.dll
+*.log
 # 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
@@ -37,53 +32,23 @@
 */*/*/*/*/bin
 */*/*/*/*/*/bin
 */*/*/*/*/*/*/bin
+.vs/
+addon-modules/
 bin/Debug/*.dll
 bin/*.dll.mdb
-db/*.db
-db/*.db-journal
-caches/addin-db-*
 bin/*.dll
-!bin/LukeSkywalker.IPNetwork.dll
-!bin/Npgsql.dll
-!bin/ICSharpCode.SharpZipLib.dll
 bin/OpenSim.vshost.exe.config
 bin/OpenSim.32BitLaunch.vshost.exe.config
-logs/OpenSim.32BitLaunch.log
 UpgradeLog.XML
 _UpgradeReport_Files/
-caches/ScriptEngines/*-*-*-*-*
-caches/ScriptEngines/*.dll
-caches/ScriptEngines/*/*.dll
-caches/ScriptEngines/*/*.state
 bin/*.maddin
 bin/*.exe
-bin/*.ini
+#bin/*.ini
-caches/j2kDecodeCache
 bin/Physics*
 bin/Terrain*
-caches/Regions/*
 bin/UserAssets
-caches/assetcache
-caches/maptiles
 bin/bakes
 bin/estate_settings.xml
-config/config-include/CenomeCache.ini
-config/config-include/FlotsamCache.ini
-config/config-include/GridCommon.ini
-config/config-include/StandaloneCommon.ini
-logs/OpenSim.Grid.AssetInventoryServer.log
-logs/OpenSim.Grid.AssetServer.log
-logs/OpenSim.Grid.GridServer.log
-logs/OpenSim.Grid.InventoryServer.log
-logs/OpenSim.Grid.MessagingServer.log
-logs/OpenSim.Grid.UserServer.log
-logs/OpenSim.log
-logs/OpenSimStats.log
-logs/Robust.log
-logs/RobustStats.log
-logs/OpenSimConsoleHistory.txt
-logs/RobustConsoleHistory.txt
-logs/*.Tests.log
 bin/*.manifest
 bin/crashes/
 Examples/*.dll
@@ -101,7 +66,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/

diff --git a/.gitignore b/.gitignore index 21f3d45..cec33fd 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,13 +1,7 @@
1	/config/sim_skeleton/stop-sim
2	/config/sim_skeleton/start-sim
3	/config/sim_skeleton/common.sh
4	/config/sim_skeleton/backup-sim
5	/config/ROBUST/stop-sim
6	/config/ROBUST/start-sim
7	/config/ROBUST/common.sh
8	/config/Robust.ini
9	.project	1	.project
10	.settings	2	.settings
		3	lastBuild
		4	#.gitignore
11	*.csproj	5	*.csproj
12	*.csproj.user	6	*.csproj.user
13	*.build	7	*.build
@@ -18,6 +12,7 @@
18	*.pidb	12	*.pidb
19	*.dll.build	13	*.dll.build
20	*.dll	14	*.dll
		15	*.log
21		16
22	# Ignore .user and .suo files as these are user preference specific	17	# Ignore .user and .suo files as these are user preference specific
23	# http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control	18	# http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
@@ -37,53 +32,23 @@
37	////*/bin	32	////*/bin
38	//////bin	33	//////bin
39	//////*/bin	34	//////*/bin
		35	.vs/
		36	addon-modules/
40	bin/Debug/*.dll	37	bin/Debug/*.dll
41	bin/*.dll.mdb	38	bin/*.dll.mdb
42	db/*.db
43	db/*.db-journal
44	caches/addin-db-*
45	bin/*.dll	39	bin/*.dll
46	!bin/LukeSkywalker.IPNetwork.dll
47	!bin/Npgsql.dll
48	!bin/ICSharpCode.SharpZipLib.dll
49	bin/OpenSim.vshost.exe.config	40	bin/OpenSim.vshost.exe.config
50	bin/OpenSim.32BitLaunch.vshost.exe.config	41	bin/OpenSim.32BitLaunch.vshost.exe.config
51	logs/OpenSim.32BitLaunch.log
52	UpgradeLog.XML	42	UpgradeLog.XML
53	_UpgradeReport_Files/	43	_UpgradeReport_Files/
54	caches/ScriptEngines/----*
55	caches/ScriptEngines/*.dll
56	caches/ScriptEngines//.dll
57	caches/ScriptEngines//.state
58	bin/*.maddin	44	bin/*.maddin
59	bin/*.exe	45	bin/*.exe
60	bin/*.ini	46	#bin/*.ini
61	caches/j2kDecodeCache
62	bin/Physics*	47	bin/Physics*
63	bin/Terrain*	48	bin/Terrain*
64	caches/Regions/*
65	bin/UserAssets	49	bin/UserAssets
66	caches/assetcache
67	caches/maptiles
68	bin/bakes	50	bin/bakes
69	bin/estate_settings.xml	51	bin/estate_settings.xml
70	config/config-include/CenomeCache.ini
71	config/config-include/FlotsamCache.ini
72	config/config-include/GridCommon.ini
73	config/config-include/StandaloneCommon.ini
74	logs/OpenSim.Grid.AssetInventoryServer.log
75	logs/OpenSim.Grid.AssetServer.log
76	logs/OpenSim.Grid.GridServer.log
77	logs/OpenSim.Grid.InventoryServer.log
78	logs/OpenSim.Grid.MessagingServer.log
79	logs/OpenSim.Grid.UserServer.log
80	logs/OpenSim.log
81	logs/OpenSimStats.log
82	logs/Robust.log
83	logs/RobustStats.log
84	logs/OpenSimConsoleHistory.txt
85	logs/RobustConsoleHistory.txt
86	logs/*.Tests.log
87	bin/*.manifest	52	bin/*.manifest
88	bin/crashes/	53	bin/crashes/
89	Examples/*.dll	54	Examples/*.dll
@@ -101,7 +66,6 @@ TAGS
101	Makefile.local	66	Makefile.local
102	bin/.version	67	bin/.version
103	compile.bat	68	compile.bat
104	addon-modules
105	OpenSim/Data/Tests/test-results/	69	OpenSim/Data/Tests/test-results/
106	OpenSim/Framework/Serialization/Tests/test-results/	70	OpenSim/Framework/Serialization/Tests/test-results/
107	OpenSim/Framework/Servers/Tests/test-results/	71	OpenSim/Framework/Servers/Tests/test-results/