Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

1 files changed, 13 insertions, 13 deletions

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 8ec6d75..bc5cbcc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -14,6 +14,19 @@
 ; *
 [Startup]
 
+; Plugin Registry Location
+; Set path to directory for plugin registry. Information
+; about the registered repositories and installed plugins
+; will be stored here
+; The Robust.exe process must hvae R/W access to the location 
+RegistryLocation = "."
+
+
+; Modular configurations
+; Set path to directory for modular ini files...
+; The Robust.exe process must hvae R/W access to the location 
+ConfigDirectory = "/home/opensim/etc/Configs"
+
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
 InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
@@ -31,19 +44,6 @@ FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnec
 MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
 MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
 
-; Plugin Registry Location
-; Set path to directory for plugin registry. Information
-; about the registered repositories and installed plugins
-; will be stored here
-; The Robust.exe process must hvae R/W access to the location 
-RegistryLocation = "."
-
-
-; Modular configurations
-; Set path to directory for modular ini files...
-; The Robust.exe process must hvae R/W access to the location 
-ConfigDirectory = "/home/opensim/etc/Configs"
-
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *