aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-06 18:02:12 +0000
committerMelanie Thielker2009-04-06 18:02:12 +0000
commitfb900f60555a0b2cce1350b3726d38e210d52799 (patch)
treee86cc1e055179129c231dd050bccffebf4cd23a8
parentincluding Makefile.local iff it exists (diff)
downloadopensim-SC_OLD-fb900f60555a0b2cce1350b3726d38e210d52799.zip
opensim-SC_OLD-fb900f60555a0b2cce1350b3726d38e210d52799.tar.gz
opensim-SC_OLD-fb900f60555a0b2cce1350b3726d38e210d52799.tar.bz2
opensim-SC_OLD-fb900f60555a0b2cce1350b3726d38e210d52799.tar.xz
Applying Intimidated's patch to fix anim handling.
Fixes Mantis #3417
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs30
-rw-r--r--bin/OpenSim.ini.example30
3 files changed, 62 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 30257f1..0da819d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -86,7 +86,8 @@ namespace OpenSim.Region.Framework.Scenes
86 public bool m_clampPrimSize = false; 86 public bool m_clampPrimSize = false;
87 public bool m_trustBinaries = false; 87 public bool m_trustBinaries = false;
88 public bool m_allowScriptCrossings = false; 88 public bool m_allowScriptCrossings = false;
89 89 public bool m_useFlySlow = false;
90 public bool m_usePreJump = false;
90 public bool m_seeIntoRegionFromNeighbor; 91 public bool m_seeIntoRegionFromNeighbor;
91 public int MaxUndoCount = 5; 92 public int MaxUndoCount = 5;
92 private int m_RestartTimerCounter; 93 private int m_RestartTimerCounter;
@@ -342,6 +343,12 @@ namespace OpenSim.Region.Framework.Scenes
342 // Region config overrides global config 343 // Region config overrides global config
343 // 344 //
344 IConfig startupConfig = m_config.Configs["Startup"]; 345 IConfig startupConfig = m_config.Configs["Startup"];
346
347 //Animation states
348 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
349 // TODO: Change default to true once the feature is supported
350 m_usePreJump = startupConfig.GetBoolean("enableprejump", false);
351
345 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 352 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
346 if (RegionInfo.NonphysPrimMax > 0) 353 if (RegionInfo.NonphysPrimMax > 0)
347 m_maxNonphys = RegionInfo.NonphysPrimMax; 354 m_maxNonphys = RegionInfo.NonphysPrimMax;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 915b202..e0593ed 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -81,7 +81,6 @@ namespace OpenSim.Region.Framework.Scenes
81 private bool MouseDown = false; 81 private bool MouseDown = false;
82 private SceneObjectGroup proxyObjectGroup; 82 private SceneObjectGroup proxyObjectGroup;
83 //private SceneObjectPart proxyObjectPart = null; 83 //private SceneObjectPart proxyObjectPart = null;
84
85 public Vector3 lastKnownAllowedPosition; 84 public Vector3 lastKnownAllowedPosition;
86 public bool sentMessageAboutRestrictedParcelFlyingDown; 85 public bool sentMessageAboutRestrictedParcelFlyingDown;
87 86
@@ -118,9 +117,10 @@ namespace OpenSim.Region.Framework.Scenes
118 private bool m_setAlwaysRun; 117 private bool m_setAlwaysRun;
119 118
120 private string m_movementAnimation = "DEFAULT"; 119 private string m_movementAnimation = "DEFAULT";
121 private long m_animPersistUntil; 120 private long m_animPersistUntil = 0;
122 private bool m_allowFalling = false; 121 private bool m_allowFalling = false;
123 122 private bool m_useFlySlow = false;
123 private bool m_usePreJump = false;
124 124
125 private Quaternion m_bodyRot= Quaternion.Identity; 125 private Quaternion m_bodyRot= Quaternion.Identity;
126 126
@@ -567,6 +567,7 @@ namespace OpenSim.Region.Framework.Scenes
567 567
568 private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) 568 private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo)
569 { 569 {
570
570 m_regionHandle = reginfo.RegionHandle; 571 m_regionHandle = reginfo.RegionHandle;
571 m_controllingClient = client; 572 m_controllingClient = client;
572 m_firstname = m_controllingClient.FirstName; 573 m_firstname = m_controllingClient.FirstName;
@@ -577,6 +578,9 @@ namespace OpenSim.Region.Framework.Scenes
577 m_regionInfo = reginfo; 578 m_regionInfo = reginfo;
578 m_localId = m_scene.AllocateLocalId(); 579 m_localId = m_scene.AllocateLocalId();
579 580
581 m_useFlySlow = m_scene.m_useFlySlow;
582 m_usePreJump = m_scene.m_usePreJump;
583
580 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 584 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
581 if (gm != null) 585 if (gm != null)
582 m_grouptitle = gm.GetGroupTitle(m_uuid); 586 m_grouptitle = gm.GetGroupTitle(m_uuid);
@@ -2007,7 +2011,14 @@ namespace OpenSim.Region.Framework.Scenes
2007 } 2011 }
2008 else 2012 else
2009 { 2013 {
2010 return "FLYSLOW"; 2014 if (m_useFlySlow == false)
2015 {
2016 return "FLY";
2017 }
2018 else
2019 {
2020 return "FLYSLOW";
2021 }
2011 } 2022 }
2012 } 2023 }
2013 else 2024 else
@@ -2152,8 +2163,15 @@ namespace OpenSim.Region.Framework.Scenes
2152 { 2163 {
2153 m_movementAnimation = movementAnimation; 2164 m_movementAnimation = movementAnimation;
2154 } 2165 }
2155 2166 if (movementAnimation == "PREJUMP" && m_usePreJump == false)
2156 TrySetMovementAnimation(movementAnimation); 2167 {
2168 //This was the previous behavior before PREJUMP
2169 TrySetMovementAnimation("JUMP");
2170 }
2171 else
2172 {
2173 TrySetMovementAnimation(movementAnimation);
2174 }
2157 } 2175 }
2158 2176
2159 /// <summary> 2177 /// <summary>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e1fdb08..d2e901a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -220,6 +220,24 @@
220 220
221 ;emailmodule = DefaultEmailModule 221 ;emailmodule = DefaultEmailModule
222 222
223 ; ##
224 ; ## ANIMATIONS
225 ; ##
226
227 ; If enabled, enableFlySlow will change the primary fly state to
228 ; FLYSLOW, and the "always run" state will be the regular fly.
229
230 enableflyslow = false
231
232 ; PreJump is an additional animation state, but it probably
233 ; won't look right until the physics engine supports it
234 ; (i.e delays takeoff for a moment)
235
236 ; This is commented so it will come on automatically once it's
237 ; supported.
238
239 ; enableprejump = true
240
223[SMTP] 241[SMTP]
224 242
225 enabled=false 243 enabled=false
@@ -237,6 +255,18 @@
237 ;InterregionComms = "LocalComms" 255 ;InterregionComms = "LocalComms"
238 InterregionComms = "RESTComms" 256 InterregionComms = "RESTComms"
239 257
258[AutoOAR]
259
260 ;Enable the AutoOAR module.
261 ;OAR's are automatically exported to Regionname_x_y.oar.tar.gz
262
263 enabled = false
264
265 ;Interval, in minutes, between exports
266
267 interval = 20
268
269
240[StandAlone] 270[StandAlone]
241 accounts_authenticate = true 271 accounts_authenticate = true
242 welcome_message = "Welcome to OpenSimulator" 272 welcome_message = "Welcome to OpenSimulator"