diff options
author | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
---|---|---|
committer | Jonathan Freedman | 2010-12-05 11:49:15 -0800 |
commit | 45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a (patch) | |
tree | 0351fb2c756a46d522fe41798c3969e020a3258d /OpenSim/Server/Handlers/Inventory | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
download | opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.zip opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.gz opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.bz2 opensim-SC_OLD-45cd2e3ef93cc8ab880cb5b1742e33d441e7d01a.tar.xz |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Server/Handlers/Inventory')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 22a718a..00f035c 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -153,7 +153,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
153 | } | 153 | } |
154 | catch (Exception e) | 154 | catch (Exception e) |
155 | { | 155 | { |
156 | m_log.Debug("[XINVENTORY HANDLER]: Exception {0}", e); | 156 | m_log.DebugFormat("[XINVENTORY HANDLER]: Exception {0}", e); |
157 | } | 157 | } |
158 | 158 | ||
159 | return FailureResult(); | 159 | return FailureResult(); |
@@ -604,6 +604,10 @@ namespace OpenSim.Server.Handlers.Asset | |||
604 | ret["CreatorId"] = item.CreatorId.ToString(); | 604 | ret["CreatorId"] = item.CreatorId.ToString(); |
605 | else | 605 | else |
606 | ret["CreatorId"] = String.Empty; | 606 | ret["CreatorId"] = String.Empty; |
607 | if (item.CreatorData != null) | ||
608 | ret["CreatorData"] = item.CreatorData; | ||
609 | else | ||
610 | ret["CreatorData"] = String.Empty; | ||
607 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); | 611 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); |
608 | ret["Description"] = item.Description.ToString(); | 612 | ret["Description"] = item.Description.ToString(); |
609 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); | 613 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); |