diff options
author | Master ScienceSim | 2010-10-25 14:11:47 -0700 |
---|---|---|
committer | Master ScienceSim | 2010-10-25 14:11:47 -0700 |
commit | 6e58c3d563b50c5797d1cfffbaec3fe82f18c2ea (patch) | |
tree | 56be5d0a766ee1449ef37f169bdbd421cd9218ac /OpenSim/Framework/AgentCircuitData.cs | |
parent | Intermediate commit for backward compatability; does not compile yet (diff) | |
download | opensim-SC_OLD-6e58c3d563b50c5797d1cfffbaec3fe82f18c2ea.zip opensim-SC_OLD-6e58c3d563b50c5797d1cfffbaec3fe82f18c2ea.tar.gz opensim-SC_OLD-6e58c3d563b50c5797d1cfffbaec3fe82f18c2ea.tar.bz2 opensim-SC_OLD-6e58c3d563b50c5797d1cfffbaec3fe82f18c2ea.tar.xz |
Half of the compatibility is working. Login into a new region with
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
Diffstat (limited to 'OpenSim/Framework/AgentCircuitData.cs')
-rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 30a9548..098b33c 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
@@ -368,15 +368,12 @@ namespace OpenSim.Framework | |||
368 | } | 368 | } |
369 | } | 369 | } |
370 | 370 | ||
371 | if (args["packed_appearance"] != null) | 371 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map)) |
372 | { | 372 | { |
373 | if (args["packed_appearance"].Type == OSDType.Map) | 373 | Appearance.Unpack((OSDMap)args["packed_appearance"]); |
374 | { | 374 | // DEBUG ON |
375 | Appearance.Unpack((OSDMap)args["packed_appearance"]); | 375 | m_log.WarnFormat("[AGENTCIRCUITDATA] unpacked appearance"); |
376 | m_log.WarnFormat("[AGENTCIRCUITDATA] unpacked appearance"); | 376 | // DEBUG OFF |
377 | } | ||
378 | else | ||
379 | m_log.WarnFormat("[AGENTCIRCUITDATA] packed_appearance is not a map:\n{0}",args["packed_appearance"].ToString()); | ||
380 | } | 377 | } |
381 | // DEBUG ON | 378 | // DEBUG ON |
382 | else | 379 | else |