Enabled the sit_ground animation. The sit state is not properly set, but it looks okay, and doesn't seem to break anything. Just move around to stand up.

2 files changed, 1 insertions, 8 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index a0bab1a..bf47277 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -629,7 +629,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 // TODO: This doesn't quite work yet -- probably a parent ID problem
                 // m_parentID = (what should this be?)
-                // SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1);
+                SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1);
             }
 
             if (m_allowMovement)
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 2fa2c14..badcc04 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.Physics.Manager
 
         public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName)
         {
-
             if (String.IsNullOrEmpty(physEngineName))
             {
                 return PhysicsScene.Null;
@@ -59,7 +58,6 @@ namespace OpenSim.Region.Physics.Manager
                 return PhysicsScene.Null;
             }
 
-
             IMesher meshEngine = null;
             if (_MeshPlugins.ContainsKey(meshEngineName))
             {
@@ -88,7 +86,6 @@ namespace OpenSim.Region.Physics.Manager
 
         public void LoadPlugins()
         {
-
             // Load "plugins", that are hard coded and not existing in form of an external lib
             IMeshingPlugin plugHard;
             plugHard = new ZeroMesherPlugin();
@@ -100,7 +97,6 @@ namespace OpenSim.Region.Physics.Manager
             string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics");
             string[] pluginFiles = Directory.GetFiles(path, "*.dll");
 
-
             for (int i = 0; i < pluginFiles.Length; i++)
             {
                 AddPlugin(pluginFiles[i]);
@@ -109,7 +105,6 @@ namespace OpenSim.Region.Physics.Manager
 
         private void AddPlugin(string FileName)
         {
-
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
             foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -160,7 +155,6 @@ namespace OpenSim.Region.Physics.Manager
                 MainLog.Instance.Verbose("PHYSICS", message);
             }
         }
-
         //---
     }
 
@@ -177,5 +171,4 @@ namespace OpenSim.Region.Physics.Manager
         string GetName();
         IMesher GetMesher();
     }
-
 }