diff options
| author | Melanie | 2011-12-10 00:40:41 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-10 00:40:41 +0000 |
| commit | 3f421837979a1d3d830274c967abc7258cb50687 (patch) | |
| tree | 3ae57deca915d7dc89586d103d48c6f6f6fd1d6d /OpenSim/Framework/AgentCircuitData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: remove a mono compiler warning (diff) | |
| download | opensim-SC-3f421837979a1d3d830274c967abc7258cb50687.zip opensim-SC-3f421837979a1d3d830274c967abc7258cb50687.tar.gz opensim-SC-3f421837979a1d3d830274c967abc7258cb50687.tar.bz2 opensim-SC-3f421837979a1d3d830274c967abc7258cb50687.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 12c8ac0..54e1bf7 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
| @@ -311,7 +311,7 @@ namespace OpenSim.Framework | |||
| 311 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map)) | 311 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map)) |
| 312 | { | 312 | { |
| 313 | Appearance.Unpack((OSDMap)args["packed_appearance"]); | 313 | Appearance.Unpack((OSDMap)args["packed_appearance"]); |
| 314 | m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance"); | 314 | // m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance"); |
| 315 | } | 315 | } |
| 316 | else | 316 | else |
| 317 | { | 317 | { |