diff options
| author | Melanie | 2011-12-08 03:37:48 +0100 |
|---|---|---|
| committer | Melanie | 2011-12-08 03:37:48 +0100 |
| commit | 7c7dd6269a0efff5b4619028825a46fcab84de63 (patch) | |
| tree | cbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Recover from an internal mess-up in the outgoing packet queues by creating (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.zip opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2 opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
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"; |