diff options
| author | Melanie | 2011-05-08 20:23:06 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:23:06 +0100 |
| commit | b451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch) | |
| tree | c9fbe41be36cf791976f9e5afabd44f69b64e747 /OpenSim/Framework/ChildAgentDataUpdate.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2 opensim-SC-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 28fe3ba..710a57d 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -460,7 +460,7 @@ namespace OpenSim.Framework | |||
| 460 | { | 460 | { |
| 461 | info["state"] = OSD.FromString(AttachmentObjectStates[i++]); | 461 | info["state"] = OSD.FromString(AttachmentObjectStates[i++]); |
| 462 | } | 462 | } |
| 463 | catch (IndexOutOfRangeException e) | 463 | catch (IndexOutOfRangeException) |
| 464 | { | 464 | { |
| 465 | m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list."); | 465 | m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list."); |
| 466 | } | 466 | } |