diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Framework/ChildAgentDataUpdate.cs | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 710a57d..613db1c 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -593,7 +593,7 @@ namespace OpenSim.Framework | |||
| 593 | // AgentTextures[i++] = o.AsUUID(); | 593 | // AgentTextures[i++] = o.AsUUID(); |
| 594 | //} | 594 | //} |
| 595 | 595 | ||
| 596 | Appearance = new AvatarAppearance(AgentID); | 596 | Appearance = new AvatarAppearance(); |
| 597 | 597 | ||
| 598 | // The code to unpack textures, visuals, wearables and attachments | 598 | // The code to unpack textures, visuals, wearables and attachments |
| 599 | // should be removed; packed appearance contains the full appearance | 599 | // should be removed; packed appearance contains the full appearance |
| @@ -635,7 +635,7 @@ namespace OpenSim.Framework | |||
| 635 | // end of code to remove | 635 | // end of code to remove |
| 636 | 636 | ||
| 637 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map) | 637 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map) |
| 638 | Appearance = new AvatarAppearance(AgentID,(OSDMap)args["packed_appearance"]); | 638 | Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]); |
| 639 | else | 639 | else |
| 640 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance"); | 640 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance"); |
| 641 | 641 | ||