* Updates UserServer

* Updates OSG1UserServices
* Friends list is now persistent in grid mode.
* You can add, new friends and remove them

2 files changed, 1 insertions, 5 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index a5e6da4..7e2d4f0 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -205,7 +205,6 @@ namespace OpenSim.Framework.Data.MySQL
                 MainLog.Instance.Error(e.ToString());
                 return;
             }
-            MainLog.Instance.Verbose("FRIEND", "Stub AddNewUserFriend called");
         }
 
         public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
@@ -241,7 +240,6 @@ namespace OpenSim.Framework.Data.MySQL
                 MainLog.Instance.Error(e.ToString());
                 return;
             }
-            MainLog.Instance.Verbose("FRIEND", "Stub RemoveUserFriend called");
         }
         public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
         {
@@ -271,7 +269,6 @@ namespace OpenSim.Framework.Data.MySQL
                 MainLog.Instance.Error(e.ToString());
                 return;
             }
-            MainLog.Instance.Verbose("FRIEND", "Stub UpdateUserFriendPerms called");
         }
 
 
@@ -318,7 +315,6 @@ namespace OpenSim.Framework.Data.MySQL
                 return Lfli;
             }
 
-            MainLog.Instance.Verbose("FRIEND", "Stub GetUserFriendList called");
             return Lfli;
         }
 
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 7af1716..af2b27c 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -385,7 +385,7 @@ namespace OpenSim.Framework.Servers
                 response.StatusCode = 301;
                 response.RedirectLocation = "secondlife:///app/login?first_name=" + keysvals["username"] + "&last_name=" +
                                             keysvals["lastname"] +
-                                            "&location=home&grid=Other&web_login_key=796f2b2a-0131-41e4-af12-00f60c24c458";
+                                            "&location=home&grid=other&web_login_key=796f2b2a-0131-41e4-af12-00f60c24c458";
 
                 response.OutputStream.Close();
             } // show_login_form == "FALSE"