aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJonathan Freedman2010-11-21 19:51:23 -0800
committerJonathan Freedman2010-11-21 19:51:23 -0800
commit562147475cc24a18da2b812a69ce2330c7633cf6 (patch)
tree1168b5591f615442f8a09fd9776209d0923c2b3d /OpenSim/Services
parentMerge git://github.com/opensim/opensim into mantis5110 (diff)
parentMerge branch 'master' of /var/git/opensim/ (diff)
downloadopensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.zip
opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz
opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2
opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz
Merge https://github.com/opensim/opensim into mantis5110
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs6
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
125 OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); 125 OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
126 if (response["Success"].AsBoolean()) 126 if (response["Success"].AsBoolean())
127 { 127 {
128 OSDMap map = null; 128 OSDMap map = null;
129 try { map = OSDParser.DeserializeJson(response["LLPackedAppearance"].AsString()) as OSDMap; } 129 try { map = OSDParser.DeserializeJson(response["LLPackedAppearance"].AsString()) as OSDMap; }
130 catch { } 130 catch { }
131 131
@@ -134,7 +134,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
134 AvatarAppearance appearance = new AvatarAppearance(map); 134 AvatarAppearance appearance = new AvatarAppearance(map);
135// DEBUG ON 135// DEBUG ON
136 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] retrieved appearance for {0}:\n{1}",userID,appearance.ToString()); 136 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] retrieved appearance for {0}:\n{1}",userID,appearance.ToString());
137// DEBUG OFF 137// DEBUG OFF
138 return appearance; 138 return appearance;
139 } 139 }
140 140
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
161 161
162// DEBUG ON 162// DEBUG ON
163 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] save appearance for {0}",userID); 163 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR] save appearance for {0}",userID);
164// DEBUG OFF 164// DEBUG OFF
165 165
166 NameValueCollection requestArgs = new NameValueCollection 166 NameValueCollection requestArgs = new NameValueCollection
167 { 167 {