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

Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-28 03:44:49 +00:00
parent e34f537a1a
commit 5752c1f5c2
23 changed files with 206 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
View File

@ -72,7 +72,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
{
get
{
switch(idx.ToLower())
switch (idx.ToLower())
{
case "name":
return region_name;

2
OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
View File

@ -296,7 +296,7 @@ namespace OpenSim.ApplicationPlugins.Rest
public bool RemoveAgentHandler(string agentName, IHttpAgentHandler handler)
{
if (!IsEnabled) return false;
if(_agents[agentName] == handler)
if (_agents[agentName] == handler)
{
_agents.Remove(agentName);
return _httpd.RemoveAgentHandler(agentName, handler);

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

@ -485,10 +485,10 @@ namespace OpenSim.Framework.Communications.Cache
{
if (HasInventory)
{
if(item.Folder == LLUUID.Zero)
if (item.Folder == LLUUID.Zero)
{
InventoryFolderImpl f=FindFolderForType(item.AssetType);
if(f != null)
if (f != null)
item.Folder=f.ID;
else
item.Folder=RootFolder.ID;
@ -617,14 +617,14 @@ namespace OpenSim.Framework.Communications.Cache
private InventoryFolderImpl FindFolderForType(int type)
{
if(RootFolder == null)
if (RootFolder == null)
return null;
lock(RootFolder.SubFolders)
lock (RootFolder.SubFolders)
{
foreach (InventoryFolderImpl f in RootFolder.SubFolders.Values)
{
if(f.Type == type)
if (f.Type == type)
return f;
}
}

22
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -310,19 +310,20 @@ namespace OpenSim.Framework.Servers
agentHandler = null;
try
{
foreach(IHttpAgentHandler handler in m_agentHandlers.Values)
foreach (IHttpAgentHandler handler in m_agentHandlers.Values)
{
if(handler.Match(request, response))
if (handler.Match(request, response))
{
agentHandler = handler;
return true;
}
}
}
catch(KeyNotFoundException) {}
catch(KeyNotFoundException)
{
}
return false;
}
/// <summary>
@ -478,7 +479,6 @@ namespace OpenSim.Framework.Servers
private bool HandleAgentRequest(IHttpAgentHandler handler, OSHttpRequest request, OSHttpResponse response)
{
// In the case of REST, then handler is responsible for ALL aspects of
// the request/response handling. Nothing is done here, not even encoding.
@ -500,11 +500,12 @@ namespace OpenSim.Framework.Servers
response.StatusCode = (int)OSHttpStatusCode.ServerErrorInternalError;
response.OutputStream.Close();
}
catch(Exception){}
catch(Exception)
{
}
}
return true;
}
public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
@ -759,13 +760,16 @@ namespace OpenSim.Framework.Servers
{
try
{
if(handler == m_agentHandlers[agent])
if (handler == m_agentHandlers[agent])
{
m_agentHandlers.Remove(agent);
return true;
}
}
catch(KeyNotFoundException) {}
catch(KeyNotFoundException)
{
}
return false;
}

6
OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
View File

@ -569,7 +569,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
{
foreach (ListenerInfo l in list)
{
if(l.GetItemID() == itemID)
if (l.GetItemID() == itemID)
data.AddRange(l.GetSerializationData());
}
}
@ -582,14 +582,14 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
int idx = 0;
Object[] item = new Object[6];
while(idx < data.Length)
while (idx < data.Length)
{
Array.Copy(data, idx, item, 0, 6);
ListenerInfo info =
ListenerInfo.FromData(localID, itemID, hostID, item);
if(!m_listeners.ContainsKey((int)item[2]))
if (!m_listeners.ContainsKey((int)item[2]))
m_listeners.Add((int)item[2], new List<ListenerInfo>());
m_listeners[(int)item[2]].Add(info);

2
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -360,7 +360,6 @@ namespace OpenSim.Region.Environment.Scenes
group.SetGroup(GroupID, remoteClient);
else
remoteClient.SendAgentAlertMessage("You don't have permission to set the group", false);
}
}
}
@ -863,7 +862,6 @@ namespace OpenSim.Region.Environment.Scenes
{
break;
}
}
grp.scriptScore = 0;
}

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Scenes
public void AddUploadedInventoryItem(LLUUID agentID, InventoryItemBase item)
{
IMoneyModule money=RequestModuleInterface<IMoneyModule>();
if(money != null)
if (money != null)
{
money.ApplyUploadCharge(agentID);
}
@ -930,7 +930,7 @@ namespace OpenSim.Region.Environment.Scenes
if (part != null)
{
TaskInventoryItem currentItem=part.GetInventoryItem(itemID);
if(currentItem == null)
if (currentItem == null)
{
LLUUID copyID = LLUUID.Random();
if (itemID != LLUUID.Zero)
@ -974,7 +974,7 @@ namespace OpenSim.Region.Environment.Scenes
{
TaskInventoryItem prevItem=part.GetInventoryItem(itemID);
itemInfo.AssetID = prevItem.AssetID;
if(part.UpdateInventoryItem(itemInfo))
if (part.UpdateInventoryItem(itemInfo))
part.GetProperties(remoteClient);
}
}

2
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
LLUUID itemID)
{
SceneObjectPart part=GetSceneObjectPart(objectID);
if(part == null)
if (part == null)
return;
EventManager.TriggerScriptReset(part.LocalId, itemID);
}

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -1407,9 +1407,9 @@ namespace OpenSim.Region.Environment.Scenes
if (remoteAvatar == null)
return;
IClientAPI cl=remoteAvatar.ControllingClient;
if(cl == null)
if (cl == null)
return;
if(m_appearance.Texture == null)
if (m_appearance.Texture == null)
return;
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,

4
OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
View File

@ -157,7 +157,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
{
IClientAPI clientView = (IClientAPI)sender;
ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId);
if(avatar == null) {
if (avatar == null) {
m_log.Info("Avatar is child agent, ignoring AvatarIsWearing event");
return;
}
@ -165,7 +165,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId);
AvatarAppearance avatAppearance = null;
if(!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) {
if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) {
m_log.Info("We didn't seem to find the appearance, falling back to ScenePresense");
avatAppearance = avatar.Appearance;
}

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -304,7 +304,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
{
int colon=t.IndexOf(":");
if(-1 != colon)
if (-1 != colon)
{
line = " at line " + Convert.ToInt32(t.Substring(colon + 1)).ToString();
break;

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -78,7 +78,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Xantor 20080525: I need assetID here to see if we already compiled this one previously
LLUUID assetID = LLUUID.Zero;
TaskInventoryItem taskInventoryItem = new TaskInventoryItem();
if(m_host.TaskInventory.TryGetValue(itemID,out taskInventoryItem))
if (m_host.TaskInventory.TryGetValue(itemID,out taskInventoryItem))
assetID = taskInventoryItem.AssetID;