aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
authorMelanie2010-11-09 22:16:48 +0000
committerMelanie2010-11-09 22:16:48 +0000
commitee85a530f6401a7be15778f15f0e2319c714c3d4 (patch)
treece3d924fe0d4c8679731c78ea8090c6ca022bdcb /OpenSim/Services/Connectors/SimianGrid
parentFix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
parentFix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
downloadopensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.zip
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.gz
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.bz2
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-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 {