From 5e805656db1215518a344d6d5364629a4997fd47 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 1 Jul 2007 13:17:27 +0000
Subject: Fixed SimpleApp - aka thankgoditssundaycommit * Updated SimpleApp
 with various introduced dependencies * Extracted ScenePrescence creation in
 Scene * removed try-catchall from UserManagerBase (that actually hid a bug) *
 Refactored RegionInfo   * handle is calculated   * it will explode upon
 accessing x,y,ip,port,externalip if not explicitly initialized * Removed
 superfluous 'ref' keywords * Removed a shitload of 'catch Exception e' that
 causes build warnings * Lots of small refactorings, renames et c * Ignored
 some bins

---
 OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj    | 4 ++--
 OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build | 2 +-
 OpenSim/Grid/GridServer/GridManager.cs                      | 8 ++++----
 OpenSim/Grid/GridServer/Main.cs                             | 2 +-
 OpenSim/Grid/UserServer/Main.cs                             | 2 +-
 OpenSim/Grid/UserServer/UserManager.cs                      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 945b7a5..caebca3 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs">
+    <Compile Include="AssetHttpServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="AssetHttpServer.cs">
+    <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 0a1b533..88724f6 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="Main.cs" />
                 <include name="AssetHttpServer.cs" />
+                <include name="Main.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index c78d14a..47f7d00 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.GridServer
                 {
                     kvp.Value.saveLog("Gridserver", target, method, args, priority, message);
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
                 }
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.GridServer
                 {
                     return kvp.Value.GetProfileByLLUUID(uuid);
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
                 }
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.GridServer
                 {
                     return kvp.Value.GetProfileByHandle(handle);
                 }
-                catch (Exception e)
+                catch
                 {
                     OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
                 }
@@ -172,7 +172,7 @@ namespace OpenSim.Grid.GridServer
                         regions[neighbour.regionHandle] = neighbour;
                     }
                 }
-                catch (Exception e)
+                catch
                 {
                     OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
                 }
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b225214..5ac64b2 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Grid.GridServer
                 }
                 configData.Commit();
             }
-            catch (Exception e)
+            catch
             {
 
             }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 640f91a..c65bb97 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Grid.UserServer
                 }
                 configData.Commit();
             }
-            catch (Exception e)
+            catch
             {
 
             }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index c99cf87..a3e3322 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Grid.UserServer
         /// </summary>
         /// <param name="response">The existing response</param>
         /// <param name="theUser">The user profile</param>
-        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
+        public override void CustomiseResponse(  LoginResponse response,   UserProfileData theUser)
         {
             // Load information from the gridserver
             SimProfile SimInfo = new SimProfile();
-- 
cgit v1.1