ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2011-12-08 03:24:25 +00:00
parent ccba04f345 eda770e978
commit 50aa89dae6
19 changed files with 231 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -62,6 +62,7 @@ namespace OpenSim
// These are the names of the plugin-points extended by this
// class during system startup.
//
private const string PLUGIN_ASSET_CACHE = "/OpenSim/AssetCache";
private const string PLUGIN_ASSET_SERVER_CLIENT = "/OpenSim/AssetClient";