aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorFreaky Tech2015-03-05 20:55:52 +0100
committerBlueWall2015-03-05 16:17:12 -0500
commit0ea69770139f4369b202362be054047a5086a220 (patch)
tree912a4130bc7b2a2a1b01cc2f24891cc714ea0429 /OpenSim/Region/CoreModules/World
parentMerge branch 'master' of /team/src/opensim (diff)
downloadopensim-SC_OLD-0ea69770139f4369b202362be054047a5086a220.zip
opensim-SC_OLD-0ea69770139f4369b202362be054047a5086a220.tar.gz
opensim-SC_OLD-0ea69770139f4369b202362be054047a5086a220.tar.bz2
opensim-SC_OLD-0ea69770139f4369b202362be054047a5086a220.tar.xz
solving HG IM, HGFriends issues based on falsified GridUser data
it does not consider GridUser as a viable source for residents' data. it does not consider Friends, Inventory Creators to be trusted at all. There are lots of broken entries in existence. There are lots of broken creator data fields in assets. The following issues arise from the broken data in the old User Management Module: failing HG IM failing HGFriends Requests Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs17
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 11b079f..13485bf 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1994,11 +1994,26 @@ namespace OpenSim.Region.CoreModules.World.Land
1994 // (d) parcels with telehubs can be the home of anyone 1994 // (d) parcels with telehubs can be the home of anyone
1995 (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))) 1995 (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))))
1996 { 1996 {
1997 if (m_scene.GridUserService.SetHome(remoteClient.AgentId.ToString(), land.RegionUUID, position, lookAt)) 1997 string userId;
1998 UUID test;
1999 if (!m_scene.UserManagementModule.GetUserUUI(remoteClient.AgentId, out userId))
2000 {
2001 /* Do not set a home position in this grid for a HG visitor */
2002 m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed. (User Lookup)");
2003 }
2004 else if (!UUID.TryParse(userId, out test))
2005 {
2006 m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed. (HG visitor)");
2007 }
2008 else if (m_scene.GridUserService.SetHome(userId, land.RegionUUID, position, lookAt))
2009 {
1998 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. 2010 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
1999 m_Dialog.SendAlertToUser(remoteClient, "Home position set."); 2011 m_Dialog.SendAlertToUser(remoteClient, "Home position set.");
2012 }
2000 else 2013 else
2014 {
2001 m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed."); 2015 m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed.");
2016 }
2002 } 2017 }
2003 else 2018 else
2004 m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel."); 2019 m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel.");