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

8
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Avatar.Attachments
{
{
public class AttachmentsModule : IAttachmentsModule, IRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (m_scene.AvatarFactory != null)
m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
}
}
}
public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient)
{
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
}
DetachSingleAttachmentToInv(itemID, remoteClient);
}
}
// What makes this method odd and unique is it tries to detach using an UUID.... Yay for standards.
// To LocalId or UUID, *THAT* is the question. How now Brown UUID??
@@ -252,6 +252,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
}
}
}
}
}
}
}

4
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@@ -394,11 +394,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
public IClientAPI LocateClientObject(UUID agentID)
{
Scene scene = GetClientScene(agentID);
if(scene == null)
if (scene == null)
return null;
ScenePresence presence = scene.GetScenePresence(agentID);
if(presence == null)
if (presence == null)
return null;
return presence.ControllingClient;

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (!m_Enabled)
return;
lock(m_Scenes)
lock (m_Scenes)
{
m_Scenes.Remove(scene);
}

2
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@@ -576,7 +576,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
foreach (SceneObjectPart part in partList)
{
if (part.OwnerID != item.Owner)
{
{
part.LastOwnerID = part.OwnerID;
part.OwnerID = item.Owner;
part.Inventory.ChangeInventoryOwner(item.Owner);

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
View File

@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
m_LocalConnector = new LocalPresenceServicesConnector(config);
// Let's stick in a test presence
m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);
m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);
}
/// <summary>
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
p.Data = new Dictionary<string, string>();
p.Data["Online"] = true.ToString();
m_presenceData.Add(UUID.Zero, p);
*/
*/
string user1 = UUID.Zero.ToString();
UUID session1 = UUID.Zero;

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;