diff options
author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Framework/Tests/AgentCircuitDataTest.cs | |
parent | Merge branch 'master' into mantis5110 (diff) | |
parent | Configuration of persistent baked textures and save/send delays. (diff) | |
download | opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.zip opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2 opensim-SC_OLD-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/Tests/AgentCircuitDataTest.cs')
-rw-r--r-- | OpenSim/Framework/Tests/AgentCircuitDataTest.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs index 2fda6f3..05d8469 100644 --- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs +++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs | |||
@@ -65,9 +65,7 @@ namespace OpenSim.Framework.Tests | |||
65 | SessionId = UUID.Random(); | 65 | SessionId = UUID.Random(); |
66 | 66 | ||
67 | AvAppearance = new AvatarAppearance(AgentId); | 67 | AvAppearance = new AvatarAppearance(AgentId); |
68 | AvAppearance.SetDefaultWearables(); | ||
69 | VisualParams = new byte[218]; | 68 | VisualParams = new byte[218]; |
70 | AvAppearance.SetDefaultParams(VisualParams); | ||
71 | 69 | ||
72 | //body | 70 | //body |
73 | VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEIGHT] = 155; | 71 | VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEIGHT] = 155; |