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

Merge branch 'avination' into careminster

avinationmerge
Melanie 2012-08-23 00:12:12 +01:00
parent df3623b01d 450207d4d8
commit 97c37c370b
6 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3809,7 +3809,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (part.ParentGroup.IsAttachment) if (part.ParentGroup.IsAttachment)
{ // Someone else's HUD, why are we getting these? { // Someone else's HUD, why are we getting these?
if (part.ParentGroup.OwnerID != AgentId && if (part.ParentGroup.OwnerID != AgentId &&
part.ParentGroup.RootPart.Shape.State >= 30) part.ParentGroup.RootPart.Shape.State > 30)
continue; continue;
ScenePresence sp; ScenePresence sp;
// Owner is not in the sim, don't update it to // Owner is not in the sim, don't update it to

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

@ -2050,7 +2050,7 @@ namespace OpenSim.Region.Framework.Scenes
if (Permissions.CanReturnObjects( if (Permissions.CanReturnObjects(
null, null,
remoteClient.AgentId, remoteClient.AgentId,
deleteGroups)) new List<SceneObjectGroup>() {grp}))
{ {
permissionToTake = true; permissionToTake = true;
permissionToDelete = true; permissionToDelete = true;

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

@ -233,7 +233,7 @@ namespace OpenSim.Region.Framework.Scenes
private int m_update_presences = 1; // Update scene presence movements private int m_update_presences = 1; // Update scene presence movements
private int m_update_events = 1; private int m_update_events = 1;
private int m_update_backup = 200; private int m_update_backup = 200;
private int m_update_terrain = 50; private int m_update_terrain = 1000;
private int m_update_land = 10; private int m_update_land = 10;
private int m_update_coarse_locations = 50; private int m_update_coarse_locations = 50;

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

@ -3306,6 +3306,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="SetVolumeDetect"></param> /// <param name="SetVolumeDetect"></param>
public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect) public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
{ {
HasGroupChanged = true;
SceneObjectPart selectionPart = GetPart(localID); SceneObjectPart selectionPart = GetPart(localID);
if (SetTemporary && Scene != null) if (SetTemporary && Scene != null)

14
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -386,6 +386,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
m_SOPXmlProcessors.Add("Friction", ProcessFriction); m_SOPXmlProcessors.Add("Friction", ProcessFriction);
m_SOPXmlProcessors.Add("Bounce", ProcessBounce); m_SOPXmlProcessors.Add("Bounce", ProcessBounce);
m_SOPXmlProcessors.Add("GravityModifier", ProcessGravityModifier); m_SOPXmlProcessors.Add("GravityModifier", ProcessGravityModifier);
m_SOPXmlProcessors.Add("CameraEyeOffset", ProcessCameraEyeOffset);
m_SOPXmlProcessors.Add("CameraAtOffset", ProcessCameraAtOffset);
#endregion #endregion
@ -639,6 +641,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty); obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty);
} }
private static void ProcessCameraEyeOffset(SceneObjectPart obj, XmlTextReader reader)
{
obj.SetCameraEyeOffset(Util.ReadVector(reader, "CameraEyeOffset"));
}
private static void ProcessCameraAtOffset(SceneObjectPart obj, XmlTextReader reader)
{
obj.SetCameraAtOffset(Util.ReadVector(reader, "CameraAtOffset"));
}
private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader) private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader)
{ {
SOPVehicle vehicle = SOPVehicle.FromXml2(reader); SOPVehicle vehicle = SOPVehicle.FromXml2(reader);
@ -1355,6 +1367,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower()); writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower());
if (sop.GravityModifier != 1.0f) if (sop.GravityModifier != 1.0f)
writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower()); writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());
WriteVector(writer, "CameraAtOffset", sop.GetCameraAtOffset());
writer.WriteEndElement(); writer.WriteEndElement();
} }

7
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6055,6 +6055,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
flags |= ScriptBaseClass.AGENT_AWAY; flags |= ScriptBaseClass.AGENT_AWAY;
} }
UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
UUID[] anims = agent.Animator.GetAnimationArray();
if (Array.Exists<UUID>(anims, a => { return a == busy; }))
{
flags |= ScriptBaseClass.AGENT_BUSY;
}
// seems to get unset, even if in mouselook, when avatar is sitting on a prim??? // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
{ {