diff options
| author | Diva Canto | 2011-05-01 09:11:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-01 09:11:16 -0700 |
| commit | f0bf64b6debf85440a823816b725dee7d41cedac (patch) | |
| tree | ba4155810f2b27a8e3220214d92ecd7faa0cc069 /OpenSim/Framework/ChildAgentDataUpdate.cs | |
| parent | Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTextur... (diff) | |
| parent | Increased Timeout to 30 secs. (diff) | |
| download | opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.zip opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.gz opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.bz2 opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.xz | |
Merge branch 'master' into caps
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
| -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 a626b82..28fe3ba 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -462,7 +462,7 @@ namespace OpenSim.Framework | |||
| 462 | } | 462 | } |
| 463 | catch (IndexOutOfRangeException e) | 463 | catch (IndexOutOfRangeException e) |
| 464 | { | 464 | { |
| 465 | m_log.WarnFormat("[CHILD AGENT DATA]: scrtips list is shorter than object list."); | 465 | m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list."); |
| 466 | } | 466 | } |
| 467 | 467 | ||
| 468 | attObjs.Add(info); | 468 | attObjs.Add(info); |