OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

afrisby
Jeff Ames 2007-12-13 19:44:47 +00:00
parent 8338e4999f
commit fd09b22552
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -629,7 +629,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
// TODO: This doesn't quite work yet -- probably a parent ID problem // TODO: This doesn't quite work yet -- probably a parent ID problem
// m_parentID = (what should this be?) // m_parentID = (what should this be?)
// SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1); SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1);
} }
if (m_allowMovement) if (m_allowMovement)

7
OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Region.Physics.Manager
public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName) public PhysicsScene GetPhysicsScene(string physEngineName, string meshEngineName)
{ {
if (String.IsNullOrEmpty(physEngineName)) if (String.IsNullOrEmpty(physEngineName))
{ {
return PhysicsScene.Null; return PhysicsScene.Null;
@ -59,7 +58,6 @@ namespace OpenSim.Region.Physics.Manager
return PhysicsScene.Null; return PhysicsScene.Null;
} }
IMesher meshEngine = null; IMesher meshEngine = null;
if (_MeshPlugins.ContainsKey(meshEngineName)) if (_MeshPlugins.ContainsKey(meshEngineName))
{ {
@ -88,7 +86,6 @@ namespace OpenSim.Region.Physics.Manager
public void LoadPlugins() public void LoadPlugins()
{ {
// Load "plugins", that are hard coded and not existing in form of an external lib // Load "plugins", that are hard coded and not existing in form of an external lib
IMeshingPlugin plugHard; IMeshingPlugin plugHard;
plugHard = new ZeroMesherPlugin(); plugHard = new ZeroMesherPlugin();
@ -100,7 +97,6 @@ namespace OpenSim.Region.Physics.Manager
string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics"); string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Physics");
string[] pluginFiles = Directory.GetFiles(path, "*.dll"); string[] pluginFiles = Directory.GetFiles(path, "*.dll");
for (int i = 0; i < pluginFiles.Length; i++) for (int i = 0; i < pluginFiles.Length; i++)
{ {
AddPlugin(pluginFiles[i]); AddPlugin(pluginFiles[i]);
@ -109,7 +105,6 @@ namespace OpenSim.Region.Physics.Manager
private void AddPlugin(string FileName) private void AddPlugin(string FileName)
{ {
Assembly pluginAssembly = Assembly.LoadFrom(FileName); Assembly pluginAssembly = Assembly.LoadFrom(FileName);
foreach (Type pluginType in pluginAssembly.GetTypes()) foreach (Type pluginType in pluginAssembly.GetTypes())
@ -160,7 +155,6 @@ namespace OpenSim.Region.Physics.Manager
MainLog.Instance.Verbose("PHYSICS", message); MainLog.Instance.Verbose("PHYSICS", message);
} }
} }
//--- //---
} }
@ -177,5 +171,4 @@ namespace OpenSim.Region.Physics.Manager
string GetName(); string GetName();
IMesher GetMesher(); IMesher GetMesher();
} }
} }