From a4c657a49dd055cdc773c95b04713f403ea9c44c Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 16 Oct 2009 23:20:05 +0000 Subject: Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla. --- indra/newview/llfloaterland.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index c1031ee437..488d71aa70 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -744,6 +744,7 @@ void LLPanelLandGeneral::refreshNames() if (!parcel) { mTextOwner->setText(LLStringUtil::null); + mTextGroup->setText(LLStringUtil::null); return; } @@ -764,6 +765,13 @@ void LLPanelLandGeneral::refreshNames() } mTextOwner->setText(owner); + std::string group; + if (!parcel->getGroupID().isNull()) + { + group = LLSLURL::buildCommand("group", parcel->getGroupID(), "inspect"); + } + mTextGroup->setText(group); + const LLUUID& auth_buyer_id = parcel->getAuthorizedBuyerID(); if(auth_buyer_id.notNull()) { @@ -781,20 +789,6 @@ void LLPanelLandGeneral::refreshNames() // virtual void LLPanelLandGeneral::draw() { - LLParcel *parcel = mParcel->getParcel(); - if (parcel) - { - std::string group; - if (!parcel->getGroupID().isNull()) - { - // *TODO: Change to "inspect" when we have group inspectors and - // move into refreshNames() above - // group = LLSLURL::buildCommand("group", parcel->getGroupID(), "inspect"); - gCacheName->getGroupName(parcel->getGroupID(), group); - } - mTextGroup->setText(group); - } - LLPanel::draw(); } -- cgit v1.2.3