diff options
author | Melanie | 2009-10-23 09:48:13 +0100 |
---|---|---|
committer | Melanie | 2009-10-23 09:48:13 +0100 |
commit | 1d47dbb3807a9204d24e6e0a12c843e9dfad4c56 (patch) | |
tree | 0e31bedbe64e15b17099961bb9cc7a8f9df23772 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Adding the presence service skeleton (diff) | |
parent | Implemented a "FrontBack" prioritizer, using distance plus the plane equation... (diff) | |
download | opensim-SC-1d47dbb3807a9204d24e6e0a12c843e9dfad4c56.zip opensim-SC-1d47dbb3807a9204d24e6e0a12c843e9dfad4c56.tar.gz opensim-SC-1d47dbb3807a9204d24e6e0a12c843e9dfad4c56.tar.bz2 opensim-SC-1d47dbb3807a9204d24e6e0a12c843e9dfad4c56.tar.xz |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d5e3445..ee848bb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -61,6 +61,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
61 | Time = 0, | 61 | Time = 0, |
62 | Distance = 1, | 62 | Distance = 1, |
63 | SimpleAngularDistance = 2, | 63 | SimpleAngularDistance = 2, |
64 | FrontBack = 3, | ||
64 | } | 65 | } |
65 | 66 | ||
66 | public delegate void SynchronizeSceneHandler(Scene scene); | 67 | public delegate void SynchronizeSceneHandler(Scene scene); |
@@ -540,6 +541,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
540 | case "simpleangulardistance": | 541 | case "simpleangulardistance": |
541 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.SimpleAngularDistance; | 542 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.SimpleAngularDistance; |
542 | break; | 543 | break; |
544 | case "frontback": | ||
545 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.FrontBack; | ||
546 | break; | ||
543 | default: | 547 | default: |
544 | m_log.Warn("[SCENE]: UpdatePrioritizationScheme was not recognized, setting to default settomg of Time"); | 548 | m_log.Warn("[SCENE]: UpdatePrioritizationScheme was not recognized, setting to default settomg of Time"); |
545 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time; | 549 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time; |