ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2009-06-10 04:28:56 +00:00
parent ca52c3ef26
commit a23d64dec1
61 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Communications.Cache
// Take all ther received items and put them into the folder tree heirarchy
foreach (InventoryItemBase item in items) {
InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null;
ItemReceive(item, folder );
ItemReceive(item, folder);
}
}
catch (Exception e)

2
OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
View File

@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Tests
{
UserProfileData userProfile = new UserProfileData();
// userProfile.ID = new UUID( Util.GetHashGuid( uri.ToString(), AssetCache.AssetInfo.Secret ));
// userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret));
return userProfile;
}

2
OpenSim/Framework/IClientAPI.cs
View File

@@ -192,7 +192,7 @@ namespace OpenSim.Framework
public delegate void ParcelReturnObjectsRequest(
int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
public delegate void ParcelDeedToGroup( int local_id, UUID group_id, IClientAPI remote_client);
public delegate void ParcelDeedToGroup(int local_id, UUID group_id, IClientAPI remote_client);
public delegate void EstateOwnerMessageRequest(
UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters,

8
OpenSim/Framework/ICnmCache.cs
View File

@@ -348,7 +348,7 @@ namespace OpenSim.Framework
/// <seealso cref="TryGetValue"/>
/// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/>
void Remove( TKey key );
void Remove(TKey key);
/// <summary>
/// Removes elements that are associated with one of <paramref name="keys"/> from the <see cref="ICnmCache{TKey,TValue}"/>.
@@ -364,7 +364,7 @@ namespace OpenSim.Framework
/// <seealso cref="TryGetValue"/>
/// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/>
void RemoveRange( IEnumerable<TKey> keys );
void RemoveRange(IEnumerable<TKey> keys);
/// <summary>
/// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
@@ -411,7 +411,7 @@ namespace OpenSim.Framework
/// <seealso cref="TryGetValue"/>
/// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/>
bool Set( TKey key, TValue value, long size );
bool Set(TKey key, TValue value, long size);
/// <summary>
/// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
@@ -436,6 +436,6 @@ namespace OpenSim.Framework
/// <seealso cref="RemoveRange"/>
/// <seealso cref="Clear"/>
/// <seealso cref="PurgeExpired"/>
bool TryGetValue( TKey key, out TValue value );
bool TryGetValue(TKey key, out TValue value);
}
}

6
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -490,13 +490,13 @@ namespace OpenSim.Framework.Servers
public string StatReport(OSHttpRequest httpRequest)
{
// If we catch a request for "callback", wrap the response in the value for jsonp
if ( httpRequest.Query.ContainsKey("callback"))
if (httpRequest.Query.ContainsKey("callback"))
{
return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ) + ");";
return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
}
else
{
return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version );
return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
}
}

2
OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs
View File

@@ -30,6 +30,6 @@ using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Servers.HttpServer
{
public delegate OSD LLSDMethod( string path, OSD request, string endpoint );
public delegate OSD LLSDMethod(string path, OSD request, string endpoint);
public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client);
}

2
OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests
[Test]
public void TestConstructor()
{
new BaseRequestHandlerImpl( null, null );
new BaseRequestHandlerImpl(null, null);
}
[Test]

2
OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.Tests
TestHelper.InMethod();
// GetAssetStreamHandler handler =
new GetAssetStreamHandler( null );
new GetAssetStreamHandler(null);
}
[Test]

2
OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
View File

@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Servers.Tests
[Test]
public void TestVersionLength()
{
Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." );
Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars.");
}
[Test]

2
OpenSim/Framework/UserConfig.cs
View File

@@ -165,7 +165,7 @@ namespace OpenSim.Framework
DefaultStartupMsg = (string) configuration_result;
break;
case "default_grid_server":
GridServerURL = new Uri( (string) configuration_result );
GridServerURL = new Uri((string) configuration_result);
break;
case "grid_send_key":
GridSendKey = (string) configuration_result;

4
OpenSim/Framework/Util.cs
View File

@@ -1060,11 +1060,11 @@ namespace OpenSim.Framework
public static Guid GetHashGuid(string data, string salt)
{
byte[] hash = ComputeMD5Hash( data + salt );
byte[] hash = ComputeMD5Hash(data + salt);
//string s = BitConverter.ToString(hash);
Guid guid = new Guid( hash );
Guid guid = new Guid(hash);
return guid;
}

2
OpenSim/Framework/WearableItem.cs
View File

@@ -131,7 +131,7 @@ namespace OpenSim.Framework
{
//int randNum = Util.RandomClass.Next(0, 1000);
float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue;
// float val =((float) randNum )/ ((float)(1000.0f / range));
// float val = ((float) randNum) / ((float)(1000.0f / range));
float val = (float)Util.RandomClass.NextDouble() * range * 0.2f;
setting.Value = setting.VisualParam.MinValue + (range / 2) + val;
}