diff options
| author | Melanie | 2011-12-08 03:24:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 03:24:25 +0000 |
| commit | 50aa89dae66246395e9aac4d7d31f010e55473e8 (patch) | |
| tree | b2d23662cc5a51e13f582728bf7064077f9edc32 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Fix intersim object give messages (diff) | |
| parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
| download | opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz | |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index e8e4f19..50baa56 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"; |