last round of warning squashing. calling it a day now.

2 files changed, 26 insertions, 26 deletions

diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 208131e..b3f8b19 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -140,12 +140,12 @@ namespace OpenSim.Grid.UserServer
 
             if (requestData.Contains("fromuri"))
             {
-                string sURI = (string)requestData["fromuri"];
-                string sagentID = (string)requestData["agentid"];
-                string ssessionID = (string)requestData["sessionid"];
-                string scurrentRegionID = (string)requestData["regionid"];
-                string sregionhandle = (string)requestData["regionhandle"];
-                string scurrentpos = (string)requestData["currentpos"];
+                // string sURI = (string)requestData["fromuri"];
+                // string sagentID = (string)requestData["agentid"];
+                // string ssessionID = (string)requestData["sessionid"];
+                // string scurrentRegionID = (string)requestData["regionid"];
+                // string sregionhandle = (string)requestData["regionhandle"];
+                // string scurrentpos = (string)requestData["currentpos"];
                 //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
                 // TODO: Okay now raise event so the user server can pass this data to the Usermanager
 
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 907a530..d4fb187 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Grid.UserServer
 
         public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request)
         {
-            XmlRpcResponse response = new XmlRpcResponse();
+            // XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable) request.Params[0];
             List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
             LLUUID queryID = new LLUUID(LLUUID.Zero.ToString());
@@ -188,25 +188,25 @@ namespace OpenSim.Grid.UserServer
 
             if (requestData.Contains("avatar_id") && requestData.Contains("region_handle") && requestData.Contains("region_uuid"))
             {
-                ulong cregionhandle = 0;
+                // ulong cregionhandle = 0;
                 LLUUID regionUUID = LLUUID.Zero;
                 LLUUID AvatarID = LLUUID.Zero;
 
                 Helpers.TryParse((string)requestData["avatar_id"], out AvatarID);
                 Helpers.TryParse((string)requestData["region_uuid"], out regionUUID);
-                try
-                {
-                    cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]);
-                }
-                catch (ArgumentException)
-                {
-                }
-                catch (OverflowException)
-                {
-                }
-                catch (FormatException)
-                {
-                }
+                // try
+                // {
+                //     cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]);
+                // }
+                // catch (ArgumentException)
+                // {
+                // }
+                // catch (OverflowException)
+                // {
+                // }
+                // catch (FormatException)
+                // {
+                // }
 
                 if (AvatarID != LLUUID.Zero)
                 {
@@ -285,9 +285,9 @@ namespace OpenSim.Grid.UserServer
 
         public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request)
         {
-            XmlRpcResponse response = new XmlRpcResponse();
+            // XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable responseData = new Hashtable();
+            // Hashtable responseData = new Hashtable();
 
             List<FriendListItem> returndata = new List<FriendListItem>();
 
@@ -354,14 +354,14 @@ namespace OpenSim.Grid.UserServer
 
         public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request)
         {
-            XmlRpcResponse response = new XmlRpcResponse();
+            // XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable) request.Params[0];
             UserProfileData userProfile;
             if (requestData.Contains("avatar_name"))
             {
                 string query = (string) requestData["avatar_name"];
 
-                Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
+                // Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
 
                 string[] querysplit;
                 querysplit = query.Split(' ');
@@ -389,7 +389,7 @@ namespace OpenSim.Grid.UserServer
 
         public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request)
         {
-            XmlRpcResponse response = new XmlRpcResponse();
+            // XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable) request.Params[0];
             UserProfileData userProfile;
             //CFK: this clogs the UserServer log and is not necessary at this time.