aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:54:34 +0100
committerMelanie2011-10-25 02:54:34 +0100
commitdc24ac4f20fb145885327609f9265aa212b9a1d2 (patch)
tree9e83a7f9245c8f1110ef8449eeb3059dfd5787a6 /OpenSim/Region/Framework/Scenes
parentMerge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge (diff)
parentrefactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w... (diff)
downloadopensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.zip
opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.tar.gz
opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.tar.bz2
opensim-SC-dc24ac4f20fb145885327609f9265aa212b9a1d2.tar.xz
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 7fada4b..c91744c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Framework.Scenes
466 scenePresence.Lastname, 466 scenePresence.Lastname,
467 newDebug); 467 newDebug);
468 468
469 scenePresence.ControllingClient.SetDebugPacketLevel(newDebug); 469 scenePresence.ControllingClient.DebugPacketLevel = newDebug;
470 } 470 }
471 }); 471 });
472 } 472 }