aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie2013-06-13 02:49:43 +0100
committerMelanie2013-06-13 02:49:43 +0100
commit9975c5674c002be0e17db02b589c388b684f63a9 (patch)
treeaa727252685987781696db21f9eee58dd6b6d023 /OpenSim/Server/Handlers
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.zip
opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.tar.gz
opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.tar.bz2
opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 64127c2..9d28dc3 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset
155 } 155 }
156 catch (Exception e) 156 catch (Exception e)
157 { 157 {
158 m_log.DebugFormat("[XINVENTORY HANDLER]: Exception {0}", e.StackTrace); 158 m_log.ErrorFormat("[XINVENTORY HANDLER]: Exception {0}", e.StackTrace);
159 } 159 }
160 160
161 return FailureResult(); 161 return FailureResult();