aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-07 17:33:06 +0000
committerJustin Clark-Casey (justincc)2011-12-07 17:33:06 +0000
commit2b02d3dc84b7b255dfd2b727df8258b886f4c45f (patch)
tree7269b569136b62f3eaa393b0b5c2a1db4e750e11 /OpenSim
parentImplement XMLRPCAdmin command admin_teleport_agent. (diff)
parentTrigger a Jenkins build (diff)
downloadopensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.zip
opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.tar.gz
opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.tar.bz2
opensim-SC_OLD-2b02d3dc84b7b255dfd2b727df8258b886f4c45f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index bae44ee..55ba18a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -62,6 +62,7 @@ namespace OpenSim
62 62
63 // These are the names of the plugin-points extended by this 63 // These are the names of the plugin-points extended by this
64 // class during system startup. 64 // class during system startup.
65 //
65 66
66 private const string PLUGIN_ASSET_CACHE = "/OpenSim/AssetCache"; 67 private const string PLUGIN_ASSET_CACHE = "/OpenSim/AssetCache";
67 private const string PLUGIN_ASSET_SERVER_CLIENT = "/OpenSim/AssetClient"; 68 private const string PLUGIN_ASSET_SERVER_CLIENT = "/OpenSim/AssetClient";