aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/ApplicationPlugins
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs14
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs6
3 files changed, 11 insertions, 13 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index d2cb788..d56a9d9 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -181,7 +181,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
181 181
182 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 182 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
183 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 183 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
184 if (m_openSim.userStatsURI != String.Empty ) 184 if (m_openSim.userStatsURI != String.Empty)
185 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); 185 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
186 } 186 }
187 187
@@ -213,7 +213,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
213 213
214 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 214 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
215 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 215 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
216 if (m_openSim.userStatsURI != String.Empty ) 216 if (m_openSim.userStatsURI != String.Empty)
217 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); 217 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
218 } 218 }
219 219
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 6f41c03..13f6426 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -392,9 +392,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
392 // on anything other than a URI token boundary. Otherwise we 392 // on anything other than a URI token boundary. Otherwise we
393 // may match on URL's that were not intended for this handler. 393 // may match on URL's that were not intended for this handler.
394 394
395 return ( path.Length == key.Length || 395 return (path.Length == key.Length ||
396 path.Substring(key.Length,1) == Rest.UrlPathSeparator); 396 path.Substring(key.Length, 1) == Rest.UrlPathSeparator);
397
398 } 397 }
399 } 398 }
400 399
@@ -416,9 +415,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
416 // on anything other than a URI token boundary. Otherwise we 415 // on anything other than a URI token boundary. Otherwise we
417 // may match on URL's that were not intended for this handler. 416 // may match on URL's that were not intended for this handler.
418 417
419 return ( path.Length == key.Length || 418 return (path.Length == key.Length ||
420 path.Substring(key.Length,1) == Rest.UrlPathSeparator); 419 path.Substring(key.Length, 1) == Rest.UrlPathSeparator);
421
422 } 420 }
423 } 421 }
424 } 422 }
@@ -465,8 +463,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
465 463
466 try 464 try
467 { 465 {
468 handled = ( FindPathHandler(request, response) || 466 handled = (FindPathHandler(request, response) ||
469 FindStreamHandler(request, response) ); 467 FindStreamHandler(request, response));
470 } 468 }
471 catch (Exception e) 469 catch (Exception e)
472 { 470 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 7798ebd..695784b 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -740,7 +740,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
740 740
741 // Scan the set of folders in the entity collection for an 741 // Scan the set of folders in the entity collection for an
742 // entry that matches the context folder. It is assumed that 742 // entry that matches the context folder. It is assumed that
743 // the only reliable indicator of this is a zero UUID ( using 743 // the only reliable indicator of this is a zero UUID (using
744 // implicit context), or the parent's UUID matches that of the 744 // implicit context), or the parent's UUID matches that of the
745 // URI designated node (explicit context). We don't allow 745 // URI designated node (explicit context). We don't allow
746 // ambiguity in this case because this is POST and we are 746 // ambiguity in this case because this is POST and we are
@@ -1621,7 +1621,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1621 1621
1622 foreach (InventoryFolderBase parent in ic.rdata.folders) 1622 foreach (InventoryFolderBase parent in ic.rdata.folders)
1623 { 1623 {
1624 if ( parent.ID == result.ParentID ) 1624 if (parent.ID == result.ParentID)
1625 { 1625 {
1626 found = true; 1626 found = true;
1627 break; 1627 break;
@@ -2002,7 +2002,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2002 2002
2003 foreach (InventoryFolderBase parent in ic.rdata.folders) 2003 foreach (InventoryFolderBase parent in ic.rdata.folders)
2004 { 2004 {
2005 if ( parent.ID == ic.Item.Folder ) 2005 if (parent.ID == ic.Item.Folder)
2006 { 2006 {
2007 found = true; 2007 found = true;
2008 break; 2008 break;