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

Formatting cleanup.

0.6.5-rc1
Jeff Ames 2009-04-14 11:38:33 +00:00
parent 6e19fb8593
commit cad0aab793
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -393,9 +393,9 @@ namespace OpenSim.Framework.Communications.Cache
protected void ProcessReceivedAsset(bool IsTexture, AssetInfo assetInf, IUserService userService)
{
if(!IsTexture && assetInf.ContainsReferences && false )
if (!IsTexture && assetInf.ContainsReferences && false)
{
assetInf.Data = ProcessAssetData(assetInf.Data, userService );
assetInf.Data = ProcessAssetData(assetInf.Data, userService);
}
}
@ -558,9 +558,9 @@ namespace OpenSim.Framework.Communications.Cache
{
string data = Encoding.ASCII.GetString(assetData);
data = ProcessAssetDataString(data, userService );
data = ProcessAssetDataString(data, userService);
return Encoding.ASCII.GetBytes( data );
return Encoding.ASCII.GetBytes(data);
}
public string ProcessAssetDataString(string data, IUserService userService)
@ -600,7 +600,7 @@ namespace OpenSim.Framework.Communications.Cache
{
Guid id;
UserProfileData userProfile = userService.GetUserProfile(userUri);
if( userProfile == null )
if (userProfile == null)
{
id = Guid.Empty;
}

10
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -439,10 +439,10 @@ namespace OpenSim.Region.Framework.Scenes
protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient)
{
SceneObjectGroup group = GetGroupByPrim(objectLocalID);
if( group != null )
if (group != null)
{
//group.DetachToGround();
m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(),remoteClient);
m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient);
}
}
@ -460,7 +460,7 @@ namespace OpenSim.Region.Framework.Scenes
IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage)
{
SceneObjectGroup group = GetGroupByPrim(objectLocalID);
if( group != null )
if (group != null)
{
if (group.OwnerID == remoteClient.AgentId)
group.SetGroup(GroupID, remoteClient);
@ -553,7 +553,7 @@ namespace OpenSim.Region.Framework.Scenes
IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
{
SceneObjectGroup group = GetGroupByPrim(objectLocalID);
if( group != null )
if (group != null)
{
if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
{
@ -1534,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes
for (int i = childPrimIds.Count - 1; i >= 0; i--)
{
SceneObjectGroup child = GetGroupByPrim(childPrimIds[i]);
if( child != null )
if (child != null)
{
// Make sure no child prim is set for sale
// So that, on delink, no prims are unwittingly

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

@ -2357,7 +2357,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (m_rootPart.PhysActor.IsPhysical)
{
if(m_rootPart.IsWaitingForFirstSpinUpdatePacket)
if (m_rootPart.IsWaitingForFirstSpinUpdatePacket)
{
// first time initialization of "old" orientation for calculation of delta rotations
m_rootPart.SpinOldOrientation = newOrientation;

2
OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
View File

@ -153,7 +153,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
region.Close();
if(m_regions.Contains(region))
if (m_regions.Contains(region))
{
lock (m_regions) m_regions.Remove(region);
}

4
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
if (script.StartsWith("//MRM:C#"))
{
if(m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
return;
try
@ -221,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries);
foreach (string s in lines)
{
if(s.StartsWith("//@DEPENDS:"))
if (s.StartsWith("//@DEPENDS:"))
{
libraries.Add(s.Replace("//@DEPENDS:", ""));
}

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
add
{
if(!_OnTouchActive)
if (!_OnTouchActive)
{
GetSOP().Flags |= PrimFlags.Touch;
_OnTouchActive = true;

4
OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim
}
}
if(e.Sender is IObject)
if (e.Sender is IObject)
{
// Ignore
}
@ -61,4 +61,4 @@ namespace OpenSim
}
}
}
}

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
View File

@ -130,7 +130,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
private void HandleChatPacket(OSChatMessage chat)
{
if(string.IsNullOrEmpty(chat.Message))
if (string.IsNullOrEmpty(chat.Message))
return;
// Object?

2
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -132,7 +132,7 @@ namespace OpenSim.Tests.Common.Setup
m.Initialise(scene, config);
scene.AddModule(m.Name, m);
}
else if(module is IRegionModuleBase)
else if (module is IRegionModuleBase)
{
// for the new system, everything has to be initialised first,
// shared modules have to be post-initialised, then all get an AddRegion with the scene