aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs8
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs4
6 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index c81ea35..69e0437 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -542,7 +542,7 @@ namespace OpenSim.Framework.Communications.Cache
542 /// </summary> 542 /// </summary>
543 /// <param name="data"></param> 543 /// <param name="data"></param>
544 /// <returns></returns> 544 /// <returns></returns>
545 private int CalculateNumPackets(byte[] data) 545 private static int CalculateNumPackets(byte[] data)
546 { 546 {
547 const uint m_maxPacketSize = 600; 547 const uint m_maxPacketSize = 600;
548 int numPackets = 1; 548 int numPackets = 1;
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index a39738d..b3852c0 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -241,7 +241,7 @@ namespace OpenSim.Framework.Communications.Cache
241 /// <param name="path"></param> 241 /// <param name="path"></param>
242 /// <param name="fileDescription"></param> 242 /// <param name="fileDescription"></param>
243 /// <param name="action"></param> 243 /// <param name="action"></param>
244 private void LoadFromFile(string path, string fileDescription, ConfigAction action) 244 private static void LoadFromFile(string path, string fileDescription, ConfigAction action)
245 { 245 {
246 if (File.Exists(path)) 246 if (File.Exists(path))
247 { 247 {
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index b6ee04d..8061e28 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -378,7 +378,7 @@ namespace OpenSim.Framework.Communications.Capabilities
378 /// 378 ///
379 /// </summary> 379 /// </summary>
380 /// <returns></returns> 380 /// <returns></returns>
381 protected LLSDMapLayer GetLLSDMapLayerResponse() 381 protected static LLSDMapLayer GetLLSDMapLayerResponse()
382 { 382 {
383 LLSDMapLayer mapLayer = new LLSDMapLayer(); 383 LLSDMapLayer mapLayer = new LLSDMapLayer();
384 mapLayer.Right = 5000; 384 mapLayer.Right = 5000;
@@ -758,7 +758,7 @@ namespace OpenSim.Framework.Communications.Capabilities
758 // bw.Close(); 758 // bw.Close();
759 // fs.Close(); 759 // fs.Close();
760 //} 760 //}
761 private void SaveAssetToFile(string filename, byte[] data) 761 private static void SaveAssetToFile(string filename, byte[] data)
762 { 762 {
763 string assetPath = "UserAssets"; 763 string assetPath = "UserAssets";
764 if (!Directory.Exists(assetPath)) 764 if (!Directory.Exists(assetPath))
@@ -840,7 +840,7 @@ namespace OpenSim.Framework.Communications.Capabilities
840 // bw.Close(); 840 // bw.Close();
841 // fs.Close(); 841 // fs.Close();
842 //} 842 //}
843 private void SaveAssetToFile(string filename, byte[] data) 843 private static void SaveAssetToFile(string filename, byte[] data)
844 { 844 {
845 string assetPath = "UserAssets"; 845 string assetPath = "UserAssets";
846 if (!Directory.Exists(assetPath)) 846 if (!Directory.Exists(assetPath))
@@ -945,7 +945,7 @@ namespace OpenSim.Framework.Communications.Capabilities
945 // bw.Close(); 945 // bw.Close();
946 // fs.Close(); 946 // fs.Close();
947 //} 947 //}
948 private void SaveAssetToFile(string filename, byte[] data) 948 private static void SaveAssetToFile(string filename, byte[] data)
949 { 949 {
950 string assetPath = "UserAssets"; 950 string assetPath = "UserAssets";
951 if (!Directory.Exists(assetPath)) 951 if (!Directory.Exists(assetPath))
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index f7989ab..b6f1f69 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -496,7 +496,7 @@ namespace OpenSim.Framework.Communications
496 return llsdBack; 496 return llsdBack;
497 } 497 }
498 498
499 private LLSDArray WrapLLSDMap(LLSDMap wrapMe) 499 private static LLSDArray WrapLLSDMap(LLSDMap wrapMe)
500 { 500 {
501 LLSDArray array = new LLSDArray(); 501 LLSDArray array = new LLSDArray();
502 array.Add(wrapMe); 502 array.Add(wrapMe);
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index db4e2ec..fa78a30 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -728,7 +728,7 @@ namespace OpenSim.Framework.Communications
728 return m_welcomeMessage; 728 return m_welcomeMessage;
729 } 729 }
730 730
731 private LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL) 731 private static LoginResponse.BuddyList ConvertFriendListItem(List<FriendListItem> LFL)
732 { 732 {
733 LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList(); 733 LoginResponse.BuddyList buddylistreturn = new LoginResponse.BuddyList();
734 foreach (FriendListItem fl in LFL) 734 foreach (FriendListItem fl in LFL)
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 91284e8..b0b7b1e 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Framework.Communications
164 /// </summary> 164 /// </summary>
165 /// <param name="s">string to be examined</param> 165 /// <param name="s">string to be examined</param>
166 /// <returns>true if slash is present</returns> 166 /// <returns>true if slash is present</returns>
167 private bool isSlashed(string s) 167 private static bool isSlashed(string s)
168 { 168 {
169 return s.Substring(s.Length - 1, 1) == "/"; 169 return s.Substring(s.Length - 1, 1) == "/";
170 } 170 }
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Communications
196 sb.Append("&"); 196 sb.Append("&");
197 197
198 sb.Append(kv.Key); 198 sb.Append(kv.Key);
199 if (kv.Value != null && kv.Value.Length != 0) 199 if (!string.IsNullOrEmpty(kv.Value))
200 { 200 {
201 sb.Append("="); 201 sb.Append("=");
202 sb.Append(kv.Value); 202 sb.Append(kv.Value);