OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show Group name when land is group-owned

0.8.0.3
Dev Random 2014-04-19 18:07:21 -04:00 committed by Justin Clark-Casey (justincc)
parent 0b743045ef
commit 7180690a14
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -75,7 +75,8 @@ namespace OpenSim.Region.CoreModules.World.Land
private LandChannel landChannel; private LandChannel landChannel;
private Scene m_scene; private Scene m_scene;
protected IGroupsModule m_groupManager;
protected IUserManagement m_userManager; protected IUserManagement m_userManager;
protected IPrimCountModule m_primCountModule; protected IPrimCountModule m_primCountModule;
protected IDialogModule m_Dialog; protected IDialogModule m_Dialog;
@ -150,9 +151,10 @@ namespace OpenSim.Region.CoreModules.World.Land
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
m_userManager = m_scene.RequestModuleInterface<IUserManagement>(); m_userManager = m_scene.RequestModuleInterface<IUserManagement>();
m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>(); m_groupManager = m_scene.RequestModuleInterface<IGroupsModule>();
m_Dialog = m_scene.RequestModuleInterface<IDialogModule>(); m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
@ -2096,8 +2098,18 @@ namespace OpenSim.Region.CoreModules.World.Land
foreach (ILandObject lo in m_landList.Values) foreach (ILandObject lo in m_landList.Values)
{ {
LandData ld = lo.LandData; LandData ld = lo.LandData;
string ownerName;
if (ld.IsGroupOwned)
{
GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
}
else
{
ownerName = m_userManager.GetUserName(ld.OwnerID);
}
cdt.AddRow( cdt.AddRow(
ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID)); ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, ownerName);
} }
} }
@ -2118,8 +2130,17 @@ namespace OpenSim.Region.CoreModules.World.Land
cdl.AddRow("Ends", lo.EndPoint); cdl.AddRow("Ends", lo.EndPoint);
cdl.AddRow("AABB Min", ld.AABBMin); cdl.AddRow("AABB Min", ld.AABBMin);
cdl.AddRow("AABB Max", ld.AABBMax); cdl.AddRow("AABB Max", ld.AABBMax);
string ownerName;
cdl.AddRow("Owner", m_userManager.GetUserName(ld.OwnerID)); if (ld.IsGroupOwned)
{
GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
}
else
{
ownerName = m_userManager.GetUserName(ld.OwnerID);
}
cdl.AddRow("Owner", ownerName);
cdl.AddRow("Is group owned?", ld.IsGroupOwned); cdl.AddRow("Is group owned?", ld.IsGroupOwned);
cdl.AddRow("GroupID", ld.GroupID); cdl.AddRow("GroupID", ld.GroupID);