aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-28 17:48:45 +0000
committerMW2007-06-28 17:48:45 +0000
commit41f26668d93dd871056ba506a306cd23e8573503 (patch)
tree44b25733c2d916c37a6af59839258fca9ce6bd30
parent*Renamed GridCommsManager to CommunicationsOGS1 to match CommunicationsLocal ... (diff)
downloadopensim-SC_OLD-41f26668d93dd871056ba506a306cd23e8573503.zip
opensim-SC_OLD-41f26668d93dd871056ba506a306cd23e8573503.tar.gz
opensim-SC_OLD-41f26668d93dd871056ba506a306cd23e8573503.tar.bz2
opensim-SC_OLD-41f26668d93dd871056ba506a306cd23e8573503.tar.xz
enabled physics plugin flying flags.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 2097870..508a3f9 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Region.Communications.Local
36 { 36 {
37 return this.getUserProfile(name); 37 return this.getUserProfile(name);
38 } 38 }
39
39 public UserProfileData GetUserProfile(LLUUID avatarID) 40 public UserProfileData GetUserProfile(LLUUID avatarID)
40 { 41 {
41 return this.getUserProfile(avatarID); 42 return this.getUserProfile(avatarID);
@@ -118,6 +119,7 @@ namespace OpenSim.Region.Communications.Local
118 { 119 {
119 return SetupMasterUser(firstName, lastName, ""); 120 return SetupMasterUser(firstName, lastName, "");
120 } 121 }
122
121 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 123 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
122 { 124 {
123 UserProfileData profile = getUserProfile(firstName, lastName); 125 UserProfileData profile = getUserProfile(firstName, lastName);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 23434a0..b90004e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -242,8 +242,7 @@ namespace OpenSim.Region.Environment.Scenes
242 Vector3 agent_control_v3 = new Vector3(0, 0, 0); 242 Vector3 agent_control_v3 = new Vector3(0, 0, 0);
243 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 243 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
244 244
245 245 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
246 // this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
247 246
248 if (q != this.bodyRot) 247 if (q != this.bodyRot)
249 { 248 {