aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs4
5 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index cd2f384..e7fb9df 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -31,6 +31,7 @@ namespace OpenSim
31 { 31 {
32 private const string VERSION_NUMBER = "0.7CM"; 32 private const string VERSION_NUMBER = "0.7CM";
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34
34 public enum Flavour 35 public enum Flavour
35 { 36 {
36 Unknown, 37 Unknown,
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 7f6a0ad..5fe0e28 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Region.CoreModules.World.Land
359 { 359 {
360 if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT) 360 if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
361 { 361 {
362 if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) 362 if (parcelAvatarIsEntering.IsEitherBannedOrRestricted(avatar.UUID))
363 { 363 {
364 SendYouAreBannedNotice(avatar); 364 SendYouAreBannedNotice(avatar);
365 ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar)); 365 ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
@@ -989,6 +989,10 @@ namespace OpenSim.Region.CoreModules.World.Land
989 //Owner Flag 989 //Owner Flag
990 tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER); 990 tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
991 } 991 }
992 else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
993 {
994 tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP);
995 }
992 else if (currentParcelBlock.LandData.SalePrice > 0 && 996 else if (currentParcelBlock.LandData.SalePrice > 0 &&
993 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero || 997 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
994 currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId)) 998 currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1f604c5..e4daa0b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2116,7 +2116,7 @@ namespace OpenSim.Region.Framework.Scenes
2116 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 2116 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
2117 { 2117 {
2118 return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates); 2118 return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates);
2119 } 2119 }
2120 2120
2121 /// <summary> 2121 /// <summary>
2122 /// Delete every object from the scene 2122 /// Delete every object from the scene
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7ed29a5..014b007 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2171,7 +2171,6 @@ namespace OpenSim.Region.Framework.Scenes
2171 public void ScheduleGroupForTerseUpdate() 2171 public void ScheduleGroupForTerseUpdate()
2172 { 2172 {
2173 lockPartsForRead(true); 2173 lockPartsForRead(true);
2174
2175 foreach (SceneObjectPart part in m_parts.Values) 2174 foreach (SceneObjectPart part in m_parts.Values)
2176 { 2175 {
2177 part.ScheduleTerseUpdate(); 2176 part.ScheduleTerseUpdate();
@@ -2184,11 +2183,11 @@ namespace OpenSim.Region.Framework.Scenes
2184 /// Immediately send a full update for this scene object. 2183 /// Immediately send a full update for this scene object.
2185 /// </summary> 2184 /// </summary>
2186 public void SendGroupFullUpdate() 2185 public void SendGroupFullUpdate()
2187 { 2186 {
2188 if (IsDeleted) 2187 if (IsDeleted)
2189 return; 2188 return;
2190 2189
2191// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2190// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
2192 2191
2193 RootPart.SendFullUpdateToAllClients(); 2192 RootPart.SendFullUpdateToAllClients();
2194 2193
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 5e6696e..e8894f7 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -804,6 +804,7 @@ namespace OpenSim.Region.Physics.OdePlugin
804 if (m_isphysical && Body != IntPtr.Zero) 804 if (m_isphysical && Body != IntPtr.Zero)
805 { 805 {
806 d.BodyDisable(Body); 806 d.BodyDisable(Body);
807 Halt();
807 } 808 }
808 } 809 }
809 810
@@ -2972,7 +2973,8 @@ Console.WriteLine(" JointCreateFixed");
2972 m_wLinObjectVel = Vector3.Zero; 2973 m_wLinObjectVel = Vector3.Zero;
2973 m_angularMotorDirection = Vector3.Zero; 2974 m_angularMotorDirection = Vector3.Zero;
2974 m_lastAngularVelocity = Vector3.Zero; 2975 m_lastAngularVelocity = Vector3.Zero;
2975 m_angularMotorDVel = Vector3.Zero; 2976 m_angularMotorDVel = Vector3.Zero;
2977 _acceleration = Vector3.Zero;
2976 } 2978 }
2977 2979
2978 private void UpdateLinDecay() 2980 private void UpdateLinDecay()