4 files changed, 23 insertions, 19 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 16fe6f9..9e48005 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -380,7 +380,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (this) {
+            lock(this) 
+            {
                 int m_regionLimit = m_config.GetInt("region_limit", 0);
 
                 try {
@@ -574,7 +575,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (this) {
+            lock(this) 
+            {
                 try {
                     Hashtable requestData = (Hashtable) request.Params[0];
                     checkStringParameters(request, new string[] {"password", "region_name"});
@@ -649,7 +651,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (this) {
+            lock(this) 
+            {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
@@ -675,12 +678,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (null != userProfile)
                         throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
 
-                    UUID userID 
-                        = m_app.CommunicationsManager.UserAdminService.AddUser(
-                            firstname, lastname, passwd, email, regX, regY);
+                    UUID userID = m_app.CommunicationsManager.UserAdminService.AddUser(firstname, lastname, 
+                                                                                       passwd, email, regX, regY);
 
                     if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
-                                                                                 firstname, lastname));
+                                                                               firstname, lastname));
 
                     responseData["success"]     = "true";
                     responseData["avatar_uuid"] = userID.ToString();
@@ -749,7 +751,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (this) {
+            lock(this) 
+            {
                 try
                 {
                     Hashtable requestData = (Hashtable)request.Params[0];
@@ -917,7 +920,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (this) {
+            lock(this) 
+            {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
@@ -1043,7 +1047,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (this) {                
+            lock(this) 
+            {                
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
@@ -1194,8 +1199,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
             
-            lock (this) {
-
+            lock(this) 
+            {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 8e88844..3ed9172 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -270,11 +270,10 @@ namespace OpenSim.Framework.Communications.Cache
                 // passphrase and salt value. The password will be created using
                 // the specified hash algorithm. Password creation can be done in
                 // several iterations.
-                PasswordDeriveBytes password = new PasswordDeriveBytes(
-                                                                passPhrase,
-                                                                saltValueBytes,
-                                                                hashAlgorithm,
-                                                                passwordIterations);
+                PasswordDeriveBytes password = new PasswordDeriveBytes(passPhrase,
+                                                                       saltValueBytes,
+                                                                       hashAlgorithm,
+                                                                       passwordIterations);
 
                 // Use the password to generate pseudo-random bytes for the encryption
                 // key. Specify the size of the key in bytes (instead of bits).
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 90c5206..24e9ca9 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
 
             try
             {
-                bool GoodLogin = false;
+                // bool GoodLogin = false;
 
                 string startLocationRequest = "last";
 
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index d79a480..f00a05c 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -709,7 +709,7 @@ namespace PrimMesher
 
             for (int i = 0; i < numAngles; i++)
             {
-                int iNext = i == numAngles ? i + 1 : 0;
+                // int iNext = i == numAngles ? i + 1 : 0;
                 angle = angles.angles[i];
                 newVert.X = angle.X * xScale;
                 newVert.Y = angle.Y * yScale;