diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Services/Connectors/SimianGrid | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs index b8703c6..2267325 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName); | 100 | // m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName); |
101 | m_GridUserService.LoggedOut(client.AgentId.ToString(), client.SessionId, client.Scene.RegionInfo.RegionID, position, lookat); | 101 | m_GridUserService.LoggedOut(client.AgentId.ToString(), client.SessionId, client.Scene.RegionInfo.RegionID, position, lookat); |
102 | } | 102 | } |
103 | } | 103 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index 810399c..360f0dd 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -213,7 +213,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
213 | wearables[11] = new AvatarWearable(map["UnderpantsItem"].AsUUID(), map["UnderpantsAsset"].AsUUID()); | 213 | wearables[11] = new AvatarWearable(map["UnderpantsItem"].AsUUID(), map["UnderpantsAsset"].AsUUID()); |
214 | wearables[12] = new AvatarWearable(map["SkirtItem"].AsUUID(), map["SkirtAsset"].AsUUID()); | 214 | wearables[12] = new AvatarWearable(map["SkirtItem"].AsUUID(), map["SkirtAsset"].AsUUID()); |
215 | 215 | ||
216 | AvatarAppearance appearance = new AvatarAppearance(userID); | 216 | AvatarAppearance appearance = new AvatarAppearance(); |
217 | appearance.Wearables = wearables; | 217 | appearance.Wearables = wearables; |
218 | appearance.AvatarHeight = (float)map["Height"].AsReal(); | 218 | appearance.AvatarHeight = (float)map["Height"].AsReal(); |
219 | 219 | ||
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
257 | 257 | ||
258 | if (avatar.AvatarType == 1) // LLAvatar | 258 | if (avatar.AvatarType == 1) // LLAvatar |
259 | { | 259 | { |
260 | AvatarAppearance appearance = avatar.ToAvatarAppearance(userID); | 260 | AvatarAppearance appearance = avatar.ToAvatarAppearance(); |
261 | 261 | ||
262 | OSDMap map = new OSDMap(); | 262 | OSDMap map = new OSDMap(); |
263 | 263 | ||