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

Merge branch 'careminster' into careminster-presence-refactor

avinationmerge
Melanie 2010-04-05 18:22:15 +01:00
parent fe034dc3e4 f505c1d0a4
commit ba31b31ed0
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Servers/VersionInfo.cs
View File

@ -31,6 +31,7 @@ namespace OpenSim
{
private const string VERSION_NUMBER = "0.7CM";
private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour
{
Unknown,

6
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -359,7 +359,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
{
if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
if (parcelAvatarIsEntering.IsEitherBannedOrRestricted(avatar.UUID))
{
SendYouAreBannedNotice(avatar);
ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
@ -989,6 +989,10 @@ namespace OpenSim.Region.CoreModules.World.Land
//Owner Flag
tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
}
else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
{
tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP);
}
else if (currentParcelBlock.LandData.SalePrice > 0 &&
(currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2116,7 +2116,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
{
return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates);
}
}
/// <summary>
/// Delete every object from the scene

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2171,7 +2171,6 @@ namespace OpenSim.Region.Framework.Scenes
public void ScheduleGroupForTerseUpdate()
{
lockPartsForRead(true);
foreach (SceneObjectPart part in m_parts.Values)
{
part.ScheduleTerseUpdate();
@ -2184,11 +2183,11 @@ namespace OpenSim.Region.Framework.Scenes
/// Immediately send a full update for this scene object.
/// </summary>
public void SendGroupFullUpdate()
{
{
if (IsDeleted)
return;
// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
RootPart.SendFullUpdateToAllClients();

4
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
View File

@ -804,6 +804,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_isphysical && Body != IntPtr.Zero)
{
d.BodyDisable(Body);
Halt();
}
}
@ -2972,7 +2973,8 @@ Console.WriteLine(" JointCreateFixed");
m_wLinObjectVel = Vector3.Zero;
m_angularMotorDirection = Vector3.Zero;
m_lastAngularVelocity = Vector3.Zero;
m_angularMotorDVel = Vector3.Zero;
m_angularMotorDVel = Vector3.Zero;
_acceleration = Vector3.Zero;
}
private void UpdateLinDecay()