aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-02 00:54:50 +0000
committerTeravus Ovares2008-01-02 00:54:50 +0000
commit3738bc88999d4cf8060fa2535cb264e0cddcb8c7 (patch)
tree3e113c52cc51f7f8c7a43a938afcd27d6edb2579 /OpenSim/Framework
parentFixed nant compile problem (diff)
downloadopensim-SC_OLD-3738bc88999d4cf8060fa2535cb264e0cddcb8c7.zip
opensim-SC_OLD-3738bc88999d4cf8060fa2535cb264e0cddcb8c7.tar.gz
opensim-SC_OLD-3738bc88999d4cf8060fa2535cb264e0cddcb8c7.tar.bz2
opensim-SC_OLD-3738bc88999d4cf8060fa2535cb264e0cddcb8c7.tar.xz
* Updates UserServer
* Updates OSG1UserServices * Friends list is now persistent in grid mode. * You can add, new friends and remove them
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
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
205 MainLog.Instance.Error(e.ToString()); 205 MainLog.Instance.Error(e.ToString());
206 return; 206 return;
207 } 207 }
208 MainLog.Instance.Verbose("FRIEND", "Stub AddNewUserFriend called");
209 } 208 }
210 209
211 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 210 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
@@ -241,7 +240,6 @@ namespace OpenSim.Framework.Data.MySQL
241 MainLog.Instance.Error(e.ToString()); 240 MainLog.Instance.Error(e.ToString());
242 return; 241 return;
243 } 242 }
244 MainLog.Instance.Verbose("FRIEND", "Stub RemoveUserFriend called");
245 } 243 }
246 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 244 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms)
247 { 245 {
@@ -271,7 +269,6 @@ namespace OpenSim.Framework.Data.MySQL
271 MainLog.Instance.Error(e.ToString()); 269 MainLog.Instance.Error(e.ToString());
272 return; 270 return;
273 } 271 }
274 MainLog.Instance.Verbose("FRIEND", "Stub UpdateUserFriendPerms called");
275 } 272 }
276 273
277 274
@@ -318,7 +315,6 @@ namespace OpenSim.Framework.Data.MySQL
318 return Lfli; 315 return Lfli;
319 } 316 }
320 317
321 MainLog.Instance.Verbose("FRIEND", "Stub GetUserFriendList called");
322 return Lfli; 318 return Lfli;
323 } 319 }
324 320
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
385 response.StatusCode = 301; 385 response.StatusCode = 301;
386 response.RedirectLocation = "secondlife:///app/login?first_name=" + keysvals["username"] + "&last_name=" + 386 response.RedirectLocation = "secondlife:///app/login?first_name=" + keysvals["username"] + "&last_name=" +
387 keysvals["lastname"] + 387 keysvals["lastname"] +
388 "&location=home&grid=Other&web_login_key=796f2b2a-0131-41e4-af12-00f60c24c458"; 388 "&location=home&grid=other&web_login_key=796f2b2a-0131-41e4-af12-00f60c24c458";
389 389
390 response.OutputStream.Close(); 390 response.OutputStream.Close();
391 } // show_login_form == "FALSE" 391 } // show_login_form == "FALSE"