diff options
| author | Kitto Flora | 2010-11-11 04:51:05 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-11-11 04:51:05 +0000 |
| commit | b2aeea66e36593ccab973240bab43724f577165b (patch) | |
| tree | 4b7bed905081a7678411f251af260e14261cc545 /OpenSim/Services | |
| parent | Fix excessive forward motion and flailing while descending a slope, prevent a... (diff) | |
| parent | Prevent teleporting to a region when the egent is banned in all parcels (diff) | |
| download | opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.zip opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.gz opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2 opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | 6 |
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 | { |