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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

xassetservice
Diva Canto 2012-02-19 12:28:47 -08:00
parent 20c65ac438 bcb9577495
commit dcea23906b
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -272,7 +272,8 @@ namespace OpenSim.Region.CoreModules.World.Land
ParcelFlags.AllowGroupScripts | ParcelFlags.AllowGroupScripts |
ParcelFlags.CreateGroupObjects | ParcelFlags.CreateGroupObjects |
ParcelFlags.AllowAPrimitiveEntry | ParcelFlags.AllowAPrimitiveEntry |
ParcelFlags.AllowGroupObjectEntry); ParcelFlags.AllowGroupObjectEntry |
ParcelFlags.AllowFly);
} }
if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale)) if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale))

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

@ -3259,10 +3259,10 @@ namespace OpenSim.Region.Framework.Scenes
/// also return a reason.</returns> /// also return a reason.</returns>
public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup) public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup)
{ {
bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 || bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 ||
(teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0); (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
bool viahome = ((teleportFlags & (uint)Constants.TeleportFlags.ViaHome) != 0); bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0);
bool godlike = ((teleportFlags & (uint)Constants.TeleportFlags.Godlike) != 0); bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0);
reason = String.Empty; reason = String.Empty;
@ -3275,9 +3275,9 @@ namespace OpenSim.Region.Framework.Scenes
// Don't disable this log message - it's too helpful // Don't disable this log message - it's too helpful
m_log.DebugFormat( m_log.DebugFormat(
"[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags {8}, position {9})", "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname, RegionInfo.RegionName, (agent.child ? "child" : "root"),agent.firstname, agent.lastname,
agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, teleportFlags, agent.startpos); agent.AgentID, agent.circuitcode, agent.IPAddress, agent.Viewer, ((TPFlags)teleportFlags).ToString(), agent.startpos);
if (LoginsDisabled) if (LoginsDisabled)
{ {

6
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1556,9 +1556,9 @@ namespace OpenSim.Region.Framework.Scenes
dupe.GroupPosition = GroupPosition; dupe.GroupPosition = GroupPosition;
dupe.OffsetPosition = OffsetPosition; dupe.OffsetPosition = OffsetPosition;
dupe.RotationOffset = RotationOffset; dupe.RotationOffset = RotationOffset;
dupe.Velocity = new Vector3(0, 0, 0); dupe.Velocity = Velocity;
dupe.Acceleration = new Vector3(0, 0, 0); dupe.Acceleration = Acceleration;
dupe.AngularVelocity = new Vector3(0, 0, 0); dupe.AngularVelocity = AngularVelocity;
dupe.Flags = Flags; dupe.Flags = Flags;
dupe.OwnershipCost = OwnershipCost; dupe.OwnershipCost = OwnershipCost;