ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-core' into mantis5110

Browse Source
This commit is contained in:
Jonathan Freedman
2010-12-05 11:49:15 -08:00
parent bc51dfc45e 6639aaeed4
commit 45cd2e3ef9
79 changed files with 2421 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
View File

@@ -53,12 +53,15 @@ namespace OpenSim.Server.Handlers.Asset
String.Empty);
if (assetService == String.Empty)
throw new Exception("No AssetService in config file");
throw new Exception("No LocalServiceModule in config file");
Object[] args = new Object[] { config };
m_AssetService =
ServerUtils.LoadPlugin<IAssetService>(assetService, args);
if (m_AssetService == null)
throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false);
server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));

6
OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
View File

@@ -153,7 +153,7 @@ namespace OpenSim.Server.Handlers.Asset
}
catch (Exception e)
{
m_log.Debug("[XINVENTORY HANDLER]: Exception {0}", e);
m_log.DebugFormat("[XINVENTORY HANDLER]: Exception {0}", e);
}
return FailureResult();
@@ -604,6 +604,10 @@ namespace OpenSim.Server.Handlers.Asset
ret["CreatorId"] = item.CreatorId.ToString();
else
ret["CreatorId"] = String.Empty;
if (item.CreatorData != null)
ret["CreatorData"] = item.CreatorData;
else
ret["CreatorData"] = String.Empty;
ret["CurrentPermissions"] = item.CurrentPermissions.ToString();
ret["Description"] = item.Description.ToString();
ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString();