Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2011-12-07 17:33:06 +00:00 · 2011-12-07 17:33:06 +00:00 · 2b02d3dc84
parent 415b7b7ec4 33c6067098
commit 2b02d3dc84
6 changed files with 1 additions and 0 deletions
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@ -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";
--- a/bin/Nini.dll
+++ b/bin/Nini.dll
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll