aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorroot2010-09-16 18:58:25 +0200
committerroot2010-09-16 18:58:25 +0200
commitec89dc99b705f86fb4ed2f984125c2196d8c6288 (patch)
treee27eea3a5c25ac57a5fa2d2df264db6ba5ec8589 /OpenSim/Region/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-ec89dc99b705f86fb4ed2f984125c2196d8c6288.zip
opensim-SC_OLD-ec89dc99b705f86fb4ed2f984125c2196d8c6288.tar.gz
opensim-SC_OLD-ec89dc99b705f86fb4ed2f984125c2196d8c6288.tar.bz2
opensim-SC_OLD-ec89dc99b705f86fb4ed2f984125c2196d8c6288.tar.xz
Some small bug fixes
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3411d18..142f5d8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Diagnostics;
32using System.Linq; 33using System.Linq;
33using System.Threading; 34using System.Threading;
34using System.Xml; 35using System.Xml;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ed92d86..8da9bdc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4330,7 +4330,7 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
4330 } 4330 }
4331 4331
4332 m_log.InfoFormat( 4332 m_log.InfoFormat(
4333 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {3}", 4333 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2}",
4334 p, itemID, asset); 4334 p, itemID, asset);
4335 } 4335 }
4336 catch (Exception e) 4336 catch (Exception e)