From a23d64dec1cbf88abc3c7e84664a683dee534e4a Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 10 Jun 2009 04:28:56 +0000
Subject: Formatting cleanup.
---
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 2 +-
OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs | 2 +-
OpenSim/Framework/IClientAPI.cs | 2 +-
OpenSim/Framework/ICnmCache.cs | 8 ++++----
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 6 +++---
OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs | 2 +-
.../Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs | 2 +-
OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | 2 +-
OpenSim/Framework/Servers/Tests/VersionInfoTests.cs | 2 +-
OpenSim/Framework/UserConfig.cs | 2 +-
OpenSim/Framework/Util.cs | 4 ++--
OpenSim/Framework/WearableItem.cs | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index cf6a798..5181bdaea 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -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)
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
index 8061c8f..f30d28b 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -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;
}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d0ae186..5d169cf 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -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,
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index 2f62189..a1ac322 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -348,7 +348,7 @@ namespace OpenSim.Framework
///
///
///
- void Remove( TKey key );
+ void Remove(TKey key);
///
/// Removes elements that are associated with one of from the .
@@ -364,7 +364,7 @@ namespace OpenSim.Framework
///
///
///
- void RemoveRange( IEnumerable keys );
+ void RemoveRange(IEnumerable keys);
///
/// Add or replace an element with the provided , and to
@@ -411,7 +411,7 @@ namespace OpenSim.Framework
///
///
///
- bool Set( TKey key, TValue value, long size );
+ bool Set(TKey key, TValue value, long size);
///
/// Gets the associated with the specified .
@@ -436,6 +436,6 @@ namespace OpenSim.Framework
///
///
///
- bool TryGetValue( TKey key, out TValue value );
+ bool TryGetValue(TKey key, out TValue value);
}
}
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index aa09c60..d2193ca 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -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);
}
}
diff --git a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs
index 87ba0d9..35655c6 100644
--- a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs
+++ b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs
@@ -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);
}
diff --git a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
index 3f17859..2fa118d 100644
--- a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests
[Test]
public void TestConstructor()
{
- new BaseRequestHandlerImpl( null, null );
+ new BaseRequestHandlerImpl(null, null);
}
[Test]
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index 6a4918d..afb4a65 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.Tests
TestHelper.InMethod();
// GetAssetStreamHandler handler =
- new GetAssetStreamHandler( null );
+ new GetAssetStreamHandler(null);
}
[Test]
diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
index 3df56a5..49e5061 100644
--- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
+++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
@@ -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]
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 3fedf22..31838ad 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -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;
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index d6202ea..0a9b67d 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -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;
}
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs
index 6675127..159306a 100644
--- a/OpenSim/Framework/WearableItem.cs
+++ b/OpenSim/Framework/WearableItem.cs
@@ -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;
}
--
cgit v1.1