aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-12-04 08:18:09 +0000
committerAdam Frisby2007-12-04 08:18:09 +0000
commitbe7ae3dd3ecddc46390f40c0315ff84703c32e7a (patch)
tree30d4a2d345a71d4de360c79ba933c9a1c3b43feb /OpenSim
parent* Fixed compile issue. (diff)
downloadopensim-SC-be7ae3dd3ecddc46390f40c0315ff84703c32e7a.zip
opensim-SC-be7ae3dd3ecddc46390f40c0315ff84703c32e7a.tar.gz
opensim-SC-be7ae3dd3ecddc46390f40c0315ff84703c32e7a.tar.bz2
opensim-SC-be7ae3dd3ecddc46390f40c0315ff84703c32e7a.tar.xz
* Removed 12 compiler warnings.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs1
-rw-r--r--OpenSim/Framework/Console/LogBase.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs1
11 files changed, 5 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 4c33bd8..e7441b8 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -178,7 +178,6 @@ namespace OpenSim.Framework.UserManagement
178 { 178 {
179 m_loginMutex.ReleaseMutex(); 179 m_loginMutex.ReleaseMutex();
180 } 180 }
181 return null;
182 } 181 }
183 182
184 /// <summary> 183 /// <summary>
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index ec3c5bc..6c97768 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -244,7 +244,7 @@ namespace OpenSim.Framework.Console
244 Log.Flush(); 244 Log.Flush();
245 } 245 }
246 246
247 catch (FormatException FE) 247 catch (FormatException)
248 { 248 {
249 System.Console.WriteLine(args); 249 System.Console.WriteLine(args);
250 } 250 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 13f8350..ef4b82d 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Grid.UserServer
118 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 118 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
119 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 119 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
120 } 120 }
121 catch (Exception e) 121 catch (Exception)
122 { 122 {
123 tryDefault = true; 123 tryDefault = true;
124 } 124 }
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 8f377c1..b0586a3 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ClientStack
125 125
126 return; 126 return;
127 } 127 }
128 catch (System.ObjectDisposedException od) 128 catch (System.ObjectDisposedException)
129 { 129 {
130 return; 130 return;
131 } 131 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 16e5d93..f4e858b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -645,8 +645,6 @@ namespace OpenSim.Region.Communications.OGS1
645 MainLog.Instance.Debug(e.ToString()); 645 MainLog.Instance.Debug(e.ToString());
646 return false; 646 return false;
647 } 647 }
648
649 return true;
650 } 648 }
651 /// <summary> 649 /// <summary>
652 /// 650 ///
@@ -857,7 +855,7 @@ namespace OpenSim.Region.Communications.OGS1
857 { 855 {
858 return m_localBackend.IncomingChildAgent(regionHandle, agentData); 856 return m_localBackend.IncomingChildAgent(regionHandle, agentData);
859 } 857 }
860 catch (RemotingException e) 858 catch (RemotingException)
861 { 859 {
862 //MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); 860 //MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
863 return false; 861 return false;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 9e1206b..b841154 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -165,7 +165,6 @@ namespace OpenSim.Region.Communications.OGS1
165 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) 165 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
166 { 166 {
167 throw new Exception("The method or operation is not implemented."); 167 throw new Exception("The method or operation is not implemented.");
168 return LLUUID.Zero;
169 } 168 }
170 } 169 }
171} \ No newline at end of file 170} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index bdcd840..cceaa14 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -292,7 +292,6 @@ namespace OpenSim.Region.Environment.Scenes
292 public EntityIntersection GetClosestIntersectingPrim(Ray hray) 292 public EntityIntersection GetClosestIntersectingPrim(Ray hray)
293 { 293 {
294 // Primitive Ray Tracing 294 // Primitive Ray Tracing
295 bool gothit = false;
296 float closestDistance = 280f; 295 float closestDistance = 280f;
297 EntityIntersection returnResult = new EntityIntersection(); 296 EntityIntersection returnResult = new EntityIntersection();
298 foreach (EntityBase ent in Entities.Values) 297 foreach (EntityBase ent in Entities.Values)
@@ -305,7 +304,6 @@ namespace OpenSim.Region.Environment.Scenes
305 { 304 {
306 if (result.distance < closestDistance) 305 if (result.distance < closestDistance)
307 { 306 {
308 gothit = true;
309 closestDistance = result.distance; 307 closestDistance = result.distance;
310 returnResult = result; 308 returnResult = result;
311 } 309 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8fc04c4..e671038 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1068,7 +1068,7 @@ namespace OpenSim.Region.Environment.Scenes
1068 { 1068 {
1069 avatar.Close(); 1069 avatar.Close();
1070 } 1070 }
1071 catch (System.NullReferenceException NE) 1071 catch (System.NullReferenceException)
1072 { 1072 {
1073 //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. 1073 //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway.
1074 1074
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 99dafac..543a468 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -956,7 +956,6 @@ namespace OpenSim.Region.Environment.Scenes
956 956
957 public void UpdatePrimFlags(ushort type, bool inUse, byte[] data) 957 public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
958 { 958 {
959 bool hasPrim = false;
960 bool usePhysics = false; 959 bool usePhysics = false;
961 bool IsTemporary = false; 960 bool IsTemporary = false;
962 bool IsPhantom = false; 961 bool IsPhantom = false;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 145e15a..abfa250 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Region.Environment.Scenes
54 private uint m_requestedSitTargetID = 0; 54 private uint m_requestedSitTargetID = 0;
55 private LLVector3 m_requestedSitOffset = new LLVector3(); 55 private LLVector3 m_requestedSitOffset = new LLVector3();
56 private float m_sitAvatarHeight = 2.0f; 56 private float m_sitAvatarHeight = 2.0f;
57 private bool m_oldColliding = true;
58 57
59 private bool m_isTyping = false; 58 private bool m_isTyping = false;
60 private bool m_setAlwaysRun = false; 59 private bool m_setAlwaysRun = false;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index aa35c4c..e72f8f5 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -222,7 +222,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
222 LSL_Types.Quaternion a1 = new LSL_Types.Quaternion(0.0, 0.0, cz, cw); 222 LSL_Types.Quaternion a1 = new LSL_Types.Quaternion(0.0, 0.0, cz, cw);
223 LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw); 223 LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw);
224 LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw); 224 LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw);
225 LSL_Types.Quaternion a = new LSL_Types.Quaternion();
226 //This multiplication doesnt compile, yet. a = a1 * a2 * a3; 225 //This multiplication doesnt compile, yet. a = a1 * a2 * a3;
227 LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz, 226 LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz,
228 aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw, 227 aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw,