aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2007-12-13 19:44:47 +0000
committerJeff Ames2007-12-13 19:44:47 +0000
commitfd09b225523610f66dc7d876ea7996a175119659 (patch)
tree205260c5aecd9d8e0e12b7d8b9e7baa4dd737e44
parentAdded placeholder for sitting on ground support. Doesn't work yet. (diff)
downloadopensim-SC_OLD-fd09b225523610f66dc7d876ea7996a175119659.zip
opensim-SC_OLD-fd09b225523610f66dc7d876ea7996a175119659.tar.gz
opensim-SC_OLD-fd09b225523610f66dc7d876ea7996a175119659.tar.bz2
opensim-SC_OLD-fd09b225523610f66dc7d876ea7996a175119659.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs7
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
629 { 629 {
630 // TODO: This doesn't quite work yet -- probably a parent ID problem 630 // TODO: This doesn't quite work yet -- probably a parent ID problem
631 // m_parentID = (what should this be?) 631 // m_parentID = (what should this be?)
632 // SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1); 632 SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1);
633 } 633 }
634 634
635 if (m_allowMovement) 635 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
48 48
49 public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName) 49 public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName)
50 { 50 {
51
52 if (String.IsNullOrEmpty(physEngineName)) 51 if (String.IsNullOrEmpty(physEngineName))
53 { 52 {
54 return PhysicsScene.Null; 53 return PhysicsScene.Null;
@@ -59,7 +58,6 @@ namespace OpenSim.Region.Physics.Manager
59 return PhysicsScene.Null; 58 return PhysicsScene.Null;
60 } 59 }
61 60
62
63 IMesher meshEngine = null; 61 IMesher meshEngine = null;
64 if (_MeshPlugins.ContainsKey(meshEngineName)) 62 if (_MeshPlugins.ContainsKey(meshEngineName))
65 { 63 {
@@ -88,7 +86,6 @@ namespace OpenSim.Region.Physics.Manager
88 86
89 public void LoadPlugins() 87 public void LoadPlugins()
90 { 88 {
91
92 // Load "plugins", that are hard coded and not existing in form of an external lib 89 // Load "plugins", that are hard coded and not existing in form of an external lib
93 IMeshingPlugin plugHard; 90 IMeshingPlugin plugHard;
94 plugHard = new ZeroMesherPlugin(); 91 plugHard = new ZeroMesherPlugin();
@@ -100,7 +97,6 @@ namespace OpenSim.Region.Physics.Manager
100 string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics"); 97 string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics");
101 string[] pluginFiles = Directory.GetFiles(path, "*.dll"); 98 string[] pluginFiles = Directory.GetFiles(path, "*.dll");
102 99
103
104 for (int i = 0; i < pluginFiles.Length; i++) 100 for (int i = 0; i < pluginFiles.Length; i++)
105 { 101 {
106 AddPlugin(pluginFiles[i]); 102 AddPlugin(pluginFiles[i]);
@@ -109,7 +105,6 @@ namespace OpenSim.Region.Physics.Manager
109 105
110 private void AddPlugin(string FileName) 106 private void AddPlugin(string FileName)
111 { 107 {
112
113 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 108 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
114 109
115 foreach (Type pluginType in pluginAssembly.GetTypes()) 110 foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -160,7 +155,6 @@ namespace OpenSim.Region.Physics.Manager
160 MainLog.Instance.Verbose("PHYSICS", message); 155 MainLog.Instance.Verbose("PHYSICS", message);
161 } 156 }
162 } 157 }
163
164 //--- 158 //---
165 } 159 }
166 160
@@ -177,5 +171,4 @@ namespace OpenSim.Region.Physics.Manager
177 string GetName(); 171 string GetName();
178 IMesher GetMesher(); 172 IMesher GetMesher();
179 } 173 }
180
181} 174}