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

1 files changed, 40 insertions, 2 deletions

diff --git a/runprebuild.sh b/runprebuild.sh
index b3b5c9d..d276edb 100755
--- a/runprebuild.sh
+++ b/runprebuild.sh
@@ -1,4 +1,42 @@
 #!/bin/sh
 
-mono bin/Prebuild.exe /target nant
-mono bin/Prebuild.exe /target vs2008
+case "$1" in
+
+  'clean')
+
+    mono bin/Prebuild.exe /clean
+
+  ;;
+
+
+  'autoclean')
+
+    echo y|mono bin/Prebuild.exe /clean
+
+  ;;
+
+
+  'vs2010')
+  
+    mono bin/Prebuild.exe /target vs2010
+  
+  ;;
+
+
+  'vs2008')
+
+    mono bin/Prebuild.exe /target vs2008
+
+  ;;
+
+
+  *)
+
+    mono bin/Prebuild.exe /target nant
+    mono bin/Prebuild.exe /target vs2008
+
+  ;;
+
+
+esac
+