aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-08-28 14:41:54 +0000
committerJeff Ames2008-08-28 14:41:54 +0000
commit3bf88587277b83c0b6f058fabba7d46a3b5a6a00 (patch)
treeed4ad9dc27e649a6f52661665fb681984251f480 /OpenSim/Framework
parentThannk you, Ralphos, for a patch the corrects an improper cast in (diff)
downloadopensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.zip
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.gz
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.bz2
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AgentCircuitManager.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Framework/Communications/GridInfoService.cs14
-rw-r--r--OpenSim/Framework/IClientAPI.cs6
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs24
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs18
8 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 80e2f87..a235688 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
112 } 112 }
113 } 113 }
114 114
115 115
116 /// <summary> 116 /// <summary>
117 /// Sometimes the circuitcode may not be known before setting up the connection 117 /// Sometimes the circuitcode may not be known before setting up the connection
118 /// </summary> 118 /// </summary>
@@ -126,7 +126,7 @@ namespace OpenSim.Framework
126 if (AgentCircuits.ContainsKey((uint)circuitcode) && !AgentCircuits.ContainsKey((uint)newcircuitcode)) 126 if (AgentCircuits.ContainsKey((uint)circuitcode) && !AgentCircuits.ContainsKey((uint)newcircuitcode))
127 { 127 {
128 AgentCircuitData agentData = AgentCircuits[(uint)circuitcode]; 128 AgentCircuitData agentData = AgentCircuits[(uint)circuitcode];
129 129
130 agentData.circuitcode = newcircuitcode; 130 agentData.circuitcode = newcircuitcode;
131 131
132 AgentCircuits.Remove((uint)circuitcode); 132 AgentCircuits.Remove((uint)circuitcode);
@@ -155,4 +155,4 @@ namespace OpenSim.Framework
155 return false; 155 return false;
156 } 156 }
157 } 157 }
158} \ No newline at end of file 158}
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 17f927d..3a20b9e 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Communications.Cache
306 // "[INVENTORY CACHE]: Received item {0} {1} for user {2}", 306 // "[INVENTORY CACHE]: Received item {0} {1} for user {2}",
307 // itemInfo.Name, itemInfo.ID, userID); 307 // itemInfo.Name, itemInfo.ID, userID);
308 InventoryFolderImpl folder = null; 308 InventoryFolderImpl folder = null;
309 309
310 if ( RootFolder != null ) 310 if ( RootFolder != null )
311 folder = RootFolder.FindFolder(itemInfo.Folder); 311 folder = RootFolder.FindFolder(itemInfo.Folder);
312 312
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 017cb29..45f6c7e 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Communications.Cache
168 { 168 {
169 if (userID == LLUUID.Zero) 169 if (userID == LLUUID.Zero)
170 return; 170 return;
171 171
172 lock (m_userProfiles) 172 lock (m_userProfiles)
173 { 173 {
174 if (m_userProfiles.ContainsKey(userID)) 174 if (m_userProfiles.ContainsKey(userID))
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 18ddd9e..a7486d6 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -617,9 +617,9 @@ namespace OpenSim.Framework.Communications.Capabilities
617 617
618 IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>(); 618 IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
619 619
620 if(mm != null) 620 if (mm != null)
621 { 621 {
622 if(!mm.UploadCovered(client)) 622 if (!mm.UploadCovered(client))
623 { 623 {
624 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); 624 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
625 625
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index ce66c82..bd108c1 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
53 /// GridInfoService uses the [GridInfo] section of the 53 /// GridInfoService uses the [GridInfo] section of the
54 /// standard OpenSim.ini file --- which is not optimal, but 54 /// standard OpenSim.ini file --- which is not optimal, but
55 /// anything else requires a general redesign of the config 55 /// anything else requires a general redesign of the config
56 /// system. 56 /// system.
57 /// </remarks> 57 /// </remarks>
58 public GridInfoService(IConfigSource configSource) 58 public GridInfoService(IConfigSource configSource)
59 { 59 {
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications
65 /// </summary> 65 /// </summary>
66 public GridInfoService() 66 public GridInfoService()
67 { 67 {
68 try 68 try
69 { 69 {
70 IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini")); 70 IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini"));
71 loadGridInfo(configSource); 71 loadGridInfo(configSource);
@@ -84,15 +84,15 @@ namespace OpenSim.Framework.Communications
84 IConfig startupCfg = configSource.Configs["Startup"]; 84 IConfig startupCfg = configSource.Configs["Startup"];
85 IConfig gridCfg = configSource.Configs["GridInfo"]; 85 IConfig gridCfg = configSource.Configs["GridInfo"];
86 IConfig netCfg = configSource.Configs["Network"]; 86 IConfig netCfg = configSource.Configs["Network"];
87 87
88 bool grid = startupCfg.GetBoolean("gridmode", false); 88 bool grid = startupCfg.GetBoolean("gridmode", false);
89 89
90 if (grid) 90 if (grid)
91 _info["mode"] = "grid"; 91 _info["mode"] = "grid";
92 else 92 else
93 _info["mode"] = "standalone"; 93 _info["mode"] = "standalone";
94 94
95 95
96 if (null != gridCfg) 96 if (null != gridCfg)
97 { 97 {
98 foreach (string k in gridCfg.GetKeys()) 98 foreach (string k in gridCfg.GetKeys())
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f437902..224b51b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -351,8 +351,8 @@ namespace OpenSim.Framework
351 351
352 bool SendLogoutPacketWhenClosing 352 bool SendLogoutPacketWhenClosing
353 { 353 {
354 set; 354 set;
355 } 355 }
356 356
357 // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")] 357 // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
358 uint CircuitCode { get; } 358 uint CircuitCode { get; }
@@ -526,7 +526,7 @@ namespace OpenSim.Framework
526 event TerrainUnacked OnUnackedTerrain; 526 event TerrainUnacked OnUnackedTerrain;
527 event ActivateGesture OnActivateGesture; 527 event ActivateGesture OnActivateGesture;
528 event DeactivateGesture OnDeactivateGesture; 528 event DeactivateGesture OnDeactivateGesture;
529 529
530 // void ActivateGesture(LLUUID assetId, LLUUID gestureId); 530 // void ActivateGesture(LLUUID assetId, LLUUID gestureId);
531 531
532 // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")] 532 // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")]
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 79929bd..d326b66 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers
278 HandleLLSDRequests(request, response); 278 HandleLLSDRequests(request, response);
279 279
280 return; 280 return;
281 } 281 }
282 HandleXmlRpcRequests(request, response); 282 HandleXmlRpcRequests(request, response);
283 return; 283 return;
284 } 284 }
@@ -498,7 +498,7 @@ namespace OpenSim.Framework.Servers
498 { 498 {
499 // we didn't find a registered llsd handler to service this request 499 // we didn't find a registered llsd handler to service this request
500 // check if we have a default llsd handler 500 // check if we have a default llsd handler
501 501
502 if (m_defaultLlsdHandler != null) 502 if (m_defaultLlsdHandler != null)
503 { 503 {
504 // LibOMV path 504 // LibOMV path
@@ -541,7 +541,7 @@ namespace OpenSim.Framework.Servers
541 541
542 private bool DoWeHaveALLSDHandler(string path) 542 private bool DoWeHaveALLSDHandler(string path)
543 { 543 {
544 544
545 string[] pathbase = path.Split('/'); 545 string[] pathbase = path.Split('/');
546 string searchquery = "/"; 546 string searchquery = "/";
547 547
@@ -559,27 +559,27 @@ namespace OpenSim.Framework.Servers
559 559
560 foreach (string pattern in m_llsdHandlers.Keys) 560 foreach (string pattern in m_llsdHandlers.Keys)
561 { 561 {
562 562
563 if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length) 563 if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length)
564 { 564 {
565 565
566 bestMatch = pattern; 566 bestMatch = pattern;
567 567
568 } 568 }
569 } 569 }
570 570
571 // extra kicker to remove the default XMLRPC login case.. just in case.. 571 // extra kicker to remove the default XMLRPC login case.. just in case..
572 if (path == "/") 572 if (path == "/")
573 return false; 573 return false;
574 574
575 if (String.IsNullOrEmpty(bestMatch)) 575 if (String.IsNullOrEmpty(bestMatch))
576 { 576 {
577 577
578 return false; 578 return false;
579 } 579 }
580 else 580 else
581 { 581 {
582 582
583 return true; 583 return true;
584 } 584 }
585 } 585 }
@@ -588,7 +588,7 @@ namespace OpenSim.Framework.Servers
588 { 588 {
589 llsdHandler = null; 589 llsdHandler = null;
590 // Pull out the first part of the path 590 // Pull out the first part of the path
591 // splitting the path by '/' means we'll get the following return.. 591 // splitting the path by '/' means we'll get the following return..
592 // {0}/{1}/{2} 592 // {0}/{1}/{2}
593 // where {0} isn't something we really control 100% 593 // where {0} isn't something we really control 100%
594 594
@@ -599,7 +599,7 @@ namespace OpenSim.Framework.Servers
599 return false; 599 return false;
600 600
601 for (int i=1; i<pathbase.Length; i++) 601 for (int i=1; i<pathbase.Length; i++)
602 { 602 {
603 searchquery += pathbase[i]; 603 searchquery += pathbase[i];
604 if (pathbase.Length-1 != i) 604 if (pathbase.Length-1 != i)
605 searchquery += "/"; 605 searchquery += "/";
@@ -609,7 +609,7 @@ namespace OpenSim.Framework.Servers
609 // 609 //
610 // [] = optional 610 // [] = optional
611 // /resource/UUID/action[/action] 611 // /resource/UUID/action[/action]
612 // 612 //
613 // now try to get the closest match to the reigstered path 613 // now try to get the closest match to the reigstered path
614 // at least for OGP, registered path would probably only consist of the /resource/ 614 // at least for OGP, registered path would probably only consist of the /resource/
615 615
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index b26d397..794dbd8 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -107,20 +107,20 @@ namespace OpenSim.Framework.Servers
107 { 107 {
108 sb.Append(m_stats.Report()); 108 sb.Append(m_stats.Report());
109 } 109 }
110 110
111 sb.Append(Environment.NewLine); 111 sb.Append(Environment.NewLine);
112 sb.Append(GetThreadsReport()); 112 sb.Append(GetThreadsReport());
113 113
114 m_log.Debug(sb); 114 m_log.Debug(sb);
115 } 115 }
116 116
117 /// <summary> 117 /// <summary>
118 /// Get a report about the registered threads in this server. 118 /// Get a report about the registered threads in this server.
119 /// </summary> 119 /// </summary>
120 protected string GetThreadsReport() 120 protected string GetThreadsReport()
121 { 121 {
122 StringBuilder sb = new StringBuilder(); 122 StringBuilder sb = new StringBuilder();
123 123
124 List<Thread> threads = ThreadTracker.GetThreads(); 124 List<Thread> threads = ThreadTracker.GetThreads();
125 if (threads == null) 125 if (threads == null)
126 { 126 {
@@ -132,13 +132,13 @@ namespace OpenSim.Framework.Servers
132 foreach (Thread t in threads) 132 foreach (Thread t in threads)
133 { 133 {
134 sb.Append( 134 sb.Append(
135 "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive 135 "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive
136 + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine); 136 + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine);
137 } 137 }
138 } 138 }
139 139
140 return sb.ToString(); 140 return sb.ToString();
141 } 141 }
142 142
143 /// <summary> 143 /// <summary>
144 /// Return a report about the uptime of this server 144 /// Return a report about the uptime of this server
@@ -312,7 +312,7 @@ namespace OpenSim.Framework.Servers
312 312
313 return; 313 return;
314 } 314 }
315 } 315 }
316 316
317 /// <summary> 317 /// <summary>
318 /// Outputs to the console information about the region 318 /// Outputs to the console information about the region