ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup. Add copyright notices.

Browse Source
This commit is contained in:
Jeff Ames
2010-03-10 13:15:36 +09:00
parent c5bb51b443
commit f58a0394ed
40 changed files with 349 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.World.Land
void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
{
//If we are forcing a position for them to go
if( forcedPosition != null )
if (forcedPosition != null)
{
ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId);
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.World.Land
forcedPosition = null;
}
//if we are far away, teleport
else if(Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3 )
else if (Vector3.Distance(clientAvatar.AbsolutePosition,forcedPosition.Value) > 3)
{
Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}",forcedPosition.Value,clientAvatar.AbsolutePosition));
clientAvatar.Teleport(forcedPosition.Value);
@@ -332,7 +332,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public void SendYouAreRestrictedNotice(ScenePresence avatar)
{
avatar.ControllingClient.SendAlertMessage(
avatar.ControllingClient.SendAlertMessage(
"You are not allowed on this parcel because the land owner has restricted access.");
}
@@ -467,7 +467,7 @@ namespace OpenSim.Region.CoreModules.World.Land
ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
}
}
else if ( parcel.IsRestrictedFromLand(clientAvatar.UUID))
else if (parcel.IsRestrictedFromLand(clientAvatar.UUID))
{
//once we've sent the message once, keep going toward the target until we are done
if (forcedPosition == null)
@@ -479,7 +479,7 @@ namespace OpenSim.Region.CoreModules.World.Land
else
{
//when we are finally in a safe place, lets release the forced position lock
forcedPosition = null;
forcedPosition = null;
}
}
}

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

@@ -287,7 +287,7 @@ namespace OpenSim.Region.CoreModules.World.Land
entry.Flags = AccessList.Ban;
entry.Time = new DateTime();
//See if they are on the list, but make sure the owner isn't banned
if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar )
if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
{
//They are banned, so lets send them a notice about this parcel
return true;