diff options
| author | Mic Bowman | 2011-04-13 15:41:17 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-13 15:41:17 -0700 |
| commit | 590d20903c6dd596cb8ae3337065f955bd207b67 (patch) | |
| tree | f6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff) | |
| parent | remove packet monitoring debugging code (diff) | |
| download | opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz | |
Merge branch 'testmerge' into queuetest
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 97af0a0..72f0402 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -997,6 +997,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 997 | { | 997 | { |
| 998 | foreach (SceneObjectPart p in ((SceneObjectGroup)entity).Parts) | 998 | foreach (SceneObjectPart p in ((SceneObjectGroup)entity).Parts) |
| 999 | { | 999 | { |
| 1000 | // m_log.DebugFormat("[SCENE GRAPH]: Part {0} has name {1}", p.UUID, p.Name); | ||
| 1001 | |||
| 1000 | if (p.Name == name) | 1002 | if (p.Name == name) |
| 1001 | { | 1003 | { |
| 1002 | sop = p; | 1004 | sop = p; |