From 6734b94761a4a8b1d03ea97fd6832c51af32bd8c Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Wed, 30 Oct 2013 15:10:29 +0200
Subject: Better error messages

This resolves http://opensimulator.org/mantis/view.php?id=6936
---
 OpenSim/Server/Base/ServerUtils.cs                         | 6 +++---
 OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 08ba50d..c92e23c 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -280,11 +280,11 @@ namespace OpenSim.Server.Base
                             {
                                 if (!(e is System.MissingMethodException))
                                 {
-                                    m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}, {3}",
+                                    m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}",
                                         interfaceName, 
                                         dllName, 
-                                        e.InnerException == null ? e.Message : e.InnerException.Message, 
-                                        e.StackTrace);
+                                        e.InnerException == null ? e.Message : e.InnerException.Message),
+                                            e);
                                 }
                                 m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length);
                                 return null;
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 0d7c136..5df3dda 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[XINVENTORY HANDLER]: Exception {0}", e.StackTrace);
+                m_log.Error(string.Format("[XINVENTORY HANDLER]: Exception {0} ", e.Message), e);
             }
 
             return FailureResult();
-- 
cgit v1.1


From 8cec0b3fa1fa36dd8823cc718dc914e8f7c0b9c8 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Thu, 31 Oct 2013 09:00:59 +0200
Subject: If updating a user's profile notes fails then return an error

Resolves http://opensimulator.org/mantis/view.php?id=6938
---
 OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index d30cc22..d55142e 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -273,10 +273,10 @@ namespace OpenSim.Server.Handlers
                 response.Result = OSD.SerializeMembers(note);
                 return true;
             }
-            
-            object Notes = (object) note;
-            OSD.DeserializeMembers(ref Notes, (OSDMap)json["params"]);
-            return true;
+
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = "Error reading notes";
+            return false;
         }
         
         public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response)
-- 
cgit v1.1