diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index 511dbeb120..3f796cceb7 100755 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs @@ -54,18 +54,16 @@ namespace OpenSim.Server.Handlers.Asset if (serverConfig == null) throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); - string assetService = serverConfig.GetString("LocalServiceModule", - String.Empty); + string assetService = serverConfig.GetString("LocalServiceModule", string.Empty); - if (assetService == String.Empty) + if (string.IsNullOrEmpty(assetService)) throw new Exception("No LocalServiceModule in config file"); - Object[] args = new Object[] { config, m_ConfigName }; - m_AssetService = - ServerUtils.LoadPlugin(assetService, args); + object[] args = new object[] { config, m_ConfigName }; + m_AssetService = ServerUtils.LoadPlugin(assetService, args); if (m_AssetService == null) - throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); + throw new Exception(string.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false); bool allowDeleteAllTypes = serverConfig.GetBoolean("AllowRemoteDeleteAllTypes", false); diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index 379119f089..82dd1b9b91 100755 Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index 3178313efe..384a521064 100755 Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 4e0338e4e4..013deec793 100755 Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index c5bf1f640f..fbc0616844 100755 Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ