aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs2
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/ICnmCache.cs8
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs6
-rw-r--r--OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs2
-rw-r--r--OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs2
-rw-r--r--OpenSim/Framework/Servers/Tests/VersionInfoTests.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs2
-rw-r--r--OpenSim/Framework/Util.cs4
-rw-r--r--OpenSim/Framework/WearableItem.cs2
12 files changed, 18 insertions, 18 deletions
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
286 // Take all ther received items and put them into the folder tree heirarchy 286 // Take all ther received items and put them into the folder tree heirarchy
287 foreach (InventoryItemBase item in items) { 287 foreach (InventoryItemBase item in items) {
288 InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null; 288 InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null;
289 ItemReceive(item, folder ); 289 ItemReceive(item, folder);
290 } 290 }
291 } 291 }
292 catch (Exception e) 292 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
64 { 64 {
65 UserProfileData userProfile = new UserProfileData(); 65 UserProfileData userProfile = new UserProfileData();
66 66
67// userProfile.ID = new UUID( Util.GetHashGuid( uri.ToString(), AssetCache.AssetInfo.Secret )); 67// userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret));
68 68
69 return userProfile; 69 return userProfile;
70 } 70 }
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
192 public delegate void ParcelReturnObjectsRequest( 192 public delegate void ParcelReturnObjectsRequest(
193 int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client); 193 int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client);
194 194
195 public delegate void ParcelDeedToGroup( int local_id, UUID group_id, IClientAPI remote_client); 195 public delegate void ParcelDeedToGroup(int local_id, UUID group_id, IClientAPI remote_client);
196 196
197 public delegate void EstateOwnerMessageRequest( 197 public delegate void EstateOwnerMessageRequest(
198 UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters, 198 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
348 /// <seealso cref="TryGetValue"/> 348 /// <seealso cref="TryGetValue"/>
349 /// <seealso cref="Clear"/> 349 /// <seealso cref="Clear"/>
350 /// <seealso cref="PurgeExpired"/> 350 /// <seealso cref="PurgeExpired"/>
351 void Remove( TKey key ); 351 void Remove(TKey key);
352 352
353 /// <summary> 353 /// <summary>
354 /// Removes elements that are associated with one of <paramref name="keys"/> from the <see cref="ICnmCache{TKey,TValue}"/>. 354 /// 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
364 /// <seealso cref="TryGetValue"/> 364 /// <seealso cref="TryGetValue"/>
365 /// <seealso cref="Clear"/> 365 /// <seealso cref="Clear"/>
366 /// <seealso cref="PurgeExpired"/> 366 /// <seealso cref="PurgeExpired"/>
367 void RemoveRange( IEnumerable<TKey> keys ); 367 void RemoveRange(IEnumerable<TKey> keys);
368 368
369 /// <summary> 369 /// <summary>
370 /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 370 /// 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
411 /// <seealso cref="TryGetValue"/> 411 /// <seealso cref="TryGetValue"/>
412 /// <seealso cref="Clear"/> 412 /// <seealso cref="Clear"/>
413 /// <seealso cref="PurgeExpired"/> 413 /// <seealso cref="PurgeExpired"/>
414 bool Set( TKey key, TValue value, long size ); 414 bool Set(TKey key, TValue value, long size);
415 415
416 /// <summary> 416 /// <summary>
417 /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>. 417 /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
@@ -436,6 +436,6 @@ namespace OpenSim.Framework
436 /// <seealso cref="RemoveRange"/> 436 /// <seealso cref="RemoveRange"/>
437 /// <seealso cref="Clear"/> 437 /// <seealso cref="Clear"/>
438 /// <seealso cref="PurgeExpired"/> 438 /// <seealso cref="PurgeExpired"/>
439 bool TryGetValue( TKey key, out TValue value ); 439 bool TryGetValue(TKey key, out TValue value);
440 } 440 }
441} 441}
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
490 public string StatReport(OSHttpRequest httpRequest) 490 public string StatReport(OSHttpRequest httpRequest)
491 { 491 {
492 // If we catch a request for "callback", wrap the response in the value for jsonp 492 // If we catch a request for "callback", wrap the response in the value for jsonp
493 if ( httpRequest.Query.ContainsKey("callback")) 493 if (httpRequest.Query.ContainsKey("callback"))
494 { 494 {
495 return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ) + ");"; 495 return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
496 } 496 }
497 else 497 else
498 { 498 {
499 return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); 499 return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
500 } 500 }
501 } 501 }
502 502
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;
30 30
31namespace OpenSim.Framework.Servers.HttpServer 31namespace OpenSim.Framework.Servers.HttpServer
32{ 32{
33 public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); 33 public delegate OSD LLSDMethod(string path, OSD request, string endpoint);
34 public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client); 34 public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client);
35} 35}
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
48 [Test] 48 [Test]
49 public void TestConstructor() 49 public void TestConstructor()
50 { 50 {
51 new BaseRequestHandlerImpl( null, null ); 51 new BaseRequestHandlerImpl(null, null);
52 } 52 }
53 53
54 [Test] 54 [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
50 TestHelper.InMethod(); 50 TestHelper.InMethod();
51 51
52 // GetAssetStreamHandler handler = 52 // GetAssetStreamHandler handler =
53 new GetAssetStreamHandler( null ); 53 new GetAssetStreamHandler(null);
54 } 54 }
55 55
56 [Test] 56 [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
38 [Test] 38 [Test]
39 public void TestVersionLength() 39 public void TestVersionLength()
40 { 40 {
41 Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." ); 41 Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars.");
42 } 42 }
43 43
44 [Test] 44 [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
165 DefaultStartupMsg = (string) configuration_result; 165 DefaultStartupMsg = (string) configuration_result;
166 break; 166 break;
167 case "default_grid_server": 167 case "default_grid_server":
168 GridServerURL = new Uri( (string) configuration_result ); 168 GridServerURL = new Uri((string) configuration_result);
169 break; 169 break;
170 case "grid_send_key": 170 case "grid_send_key":
171 GridSendKey = (string) configuration_result; 171 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
1060 1060
1061 public static Guid GetHashGuid(string data, string salt) 1061 public static Guid GetHashGuid(string data, string salt)
1062 { 1062 {
1063 byte[] hash = ComputeMD5Hash( data + salt ); 1063 byte[] hash = ComputeMD5Hash(data + salt);
1064 1064
1065 //string s = BitConverter.ToString(hash); 1065 //string s = BitConverter.ToString(hash);
1066 1066
1067 Guid guid = new Guid( hash ); 1067 Guid guid = new Guid(hash);
1068 1068
1069 return guid; 1069 return guid;
1070 } 1070 }
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
131 { 131 {
132 //int randNum = Util.RandomClass.Next(0, 1000); 132 //int randNum = Util.RandomClass.Next(0, 1000);
133 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue; 133 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue;
134 // float val =((float) randNum )/ ((float)(1000.0f / range)); 134 // float val = ((float) randNum) / ((float)(1000.0f / range));
135 float val = (float)Util.RandomClass.NextDouble() * range * 0.2f; 135 float val = (float)Util.RandomClass.NextDouble() * range * 0.2f;
136 setting.Value = setting.VisualParam.MinValue + (range / 2) + val; 136 setting.Value = setting.VisualParam.MinValue + (range / 2) + val;
137 } 137 }