aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj4
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs8
-rw-r--r--OpenSim/Grid/GridServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
6 files changed, 10 insertions, 10 deletions
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 @@
98 <ItemGroup> 98 <ItemGroup>
99 </ItemGroup> 99 </ItemGroup>
100 <ItemGroup> 100 <ItemGroup>
101 <Compile Include="Main.cs"> 101 <Compile Include="AssetHttpServer.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="AssetHttpServer.cs"> 104 <Compile Include="Main.cs">
105 <SubType>Code</SubType> 105 <SubType>Code</SubType>
106 </Compile> 106 </Compile>
107 <Compile Include="Properties\AssemblyInfo.cs"> 107 <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 @@
11 <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Main.cs" />
15 <include name="AssetHttpServer.cs" /> 14 <include name="AssetHttpServer.cs" />
15 <include name="Main.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <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
108 { 108 {
109 kvp.Value.saveLog("Gridserver", target, method, args, priority, message); 109 kvp.Value.saveLog("Gridserver", target, method, args, priority, message);
110 } 110 }
111 catch (Exception e) 111 catch (Exception)
112 { 112 {
113 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); 113 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
114 } 114 }
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.GridServer
127 { 127 {
128 return kvp.Value.GetProfileByLLUUID(uuid); 128 return kvp.Value.GetProfileByLLUUID(uuid);
129 } 129 }
130 catch (Exception e) 130 catch (Exception)
131 { 131 {
132 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 132 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
133 } 133 }
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.GridServer
148 { 148 {
149 return kvp.Value.GetProfileByHandle(handle); 149 return kvp.Value.GetProfileByHandle(handle);
150 } 150 }
151 catch (Exception e) 151 catch
152 { 152 {
153 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); 153 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
154 } 154 }
@@ -172,7 +172,7 @@ namespace OpenSim.Grid.GridServer
172 regions[neighbour.regionHandle] = neighbour; 172 regions[neighbour.regionHandle] = neighbour;
173 } 173 }
174 } 174 }
175 catch (Exception e) 175 catch
176 { 176 {
177 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); 177 OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
178 } 178 }
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
262 } 262 }
263 configData.Commit(); 263 configData.Commit();
264 } 264 }
265 catch (Exception e) 265 catch
266 { 266 {
267 267
268 } 268 }
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
178 } 178 }
179 configData.Commit(); 179 configData.Commit();
180 } 180 }
181 catch (Exception e) 181 catch
182 { 182 {
183 183
184 } 184 }
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
56 /// </summary> 56 /// </summary>
57 /// <param name="response">The existing response</param> 57 /// <param name="response">The existing response</param>
58 /// <param name="theUser">The user profile</param> 58 /// <param name="theUser">The user profile</param>
59 public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser) 59 public override void CustomiseResponse( LoginResponse response, UserProfileData theUser)
60 { 60 {
61 // Load information from the gridserver 61 // Load information from the gridserver
62 SimProfile SimInfo = new SimProfile(); 62 SimProfile SimInfo = new SimProfile();