Merge https://github.com/opensim/opensim into mantis5110

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 7a28c2b..65a02df 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
-                OSDMap map = null;                
+                OSDMap map = null;
                 try { map = OSDParser.DeserializeJson(response["LLPackedAppearance"].AsString()) as OSDMap; }
                 catch { }
 
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     AvatarAppearance appearance = new AvatarAppearance(map);
 // DEBUG ON
                     m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] retrieved appearance for {0}:\n{1}",userID,appearance.ToString());
-// DEBUG OFF                    
+// DEBUG OFF
                     return appearance;
                 }
 
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
 // DEBUG ON
             m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] save appearance for {0}",userID);
-// DEBUG OFF                    
+// DEBUG OFF
 
             NameValueCollection requestArgs = new NameValueCollection
                 {