Second Life viewer sources 1.19.1.0

1 files changed, 42 insertions, 63 deletions

diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 664c9a6..5d32f4b 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -159,7 +159,7 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
         {
                 // check if inside
                 //LLRect parent_rect = mParentView->getRect();
-                //mRect.set(0, parent_rect.getHeight(), parent_rect.getWidth(), 0);
+                //getRect().set(0, parent_rect.getHeight(), parent_rect.getWidth(), 0);
                 handled = TRUE;
 
                 // check the type
@@ -282,13 +282,12 @@ void LLPanelAvatarSecondLife::updatePartnerName()
 {
         if (mPartnerID.notNull())
         {
-                char first[128];                /*Flawfinder: ignore*/
-                char last[128];         /*Flawfinder: ignore*/
+                std::string first, last;
                 BOOL found = gCacheName->getName(mPartnerID, first, last);
                 if (found)
                 {
-                        childSetTextArg("partner_edit", "[FIRST]", LLString(first));
-                        childSetTextArg("partner_edit", "[LAST]", LLString(last));
+                        childSetTextArg("partner_edit", "[FIRST]", first);
+                        childSetTextArg("partner_edit", "[LAST]", last);
                 }
                 childSetEnabled("partner_info", TRUE);
         }
@@ -301,7 +300,7 @@ void LLPanelAvatarSecondLife::updatePartnerName()
 //-----------------------------------------------------------------------------
 void LLPanelAvatarSecondLife::clearControls()
 {
-        LLTextureCtrl*  image_ctrl = LLUICtrlFactory::getTexturePickerByName(this,"img");
+        LLTextureCtrl*  image_ctrl = getChild<LLTextureCtrl>("img");
         if(image_ctrl)
         {
                 image_ctrl->setImageAssetID(LLUUID::null);
@@ -495,15 +494,13 @@ BOOL LLPanelAvatarWeb::postBuild(void)
 
         childSetControlName("auto_load","AutoLoadWebProfiles");
 
-#if LL_LIBXUL_ENABLED
-        mWebBrowser = (LLWebBrowserCtrl*)getChildByName("profile_html");
+        mWebBrowser = getChild<LLWebBrowserCtrl>("profile_html");
 
         // links open in internally 
         mWebBrowser->setOpenInExternalBrowser( false );
 
         // observe browser events
         mWebBrowser->addObserver( this );
-#endif // LL_LIBXUL_ENABLED
 
         return TRUE;
 }
@@ -563,13 +560,11 @@ LLPanelAvatarWeb::LLPanelAvatarWeb(const std::string& name, const LLRect& rect,
 
 LLPanelAvatarWeb::~LLPanelAvatarWeb()
 {
-#if LL_LIBXUL_ENABLED
         // stop observing browser events
         if  ( mWebBrowser )
         {
                 mWebBrowser->remObserver( this );
         };
-#endif
 }
 
 void LLPanelAvatarWeb::enableControls(BOOL self)
@@ -610,12 +605,6 @@ void LLPanelAvatarWeb::setWebURL(std::string url)
         BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
         childSetVisible("status_text",!own_avatar && !mURL.empty());
         
-#if !LL_LIBXUL_ENABLED
-        childSetVisible("load",false);
-        childSetVisible("profile_html",false);
-        childSetVisible("status_text",false);
-#endif
-
 }
 
 // static
@@ -631,18 +620,13 @@ void LLPanelAvatarWeb::onCommitURL(LLUICtrl* ctrl, void* data)
 // static
 void LLPanelAvatarWeb::onClickWebProfileHelp(void *)
 {
-#if LL_LIBXUL_ENABLED
         gViewerWindow->alertXml("ClickWebProfileHelpAvatar");
-#else
-        gViewerWindow->alertXml("ClickWebProfileNoWebHelpAvatar");
-#endif
 }
 
 void LLPanelAvatarWeb::load(std::string url)
 {
         bool have_url = (!url.empty());
 
-#if LL_LIBXUL_ENABLED
         if (have_url)
         {
                 llinfos << "Loading " << url << llendl;
@@ -662,9 +646,6 @@ void LLPanelAvatarWeb::load(std::string url)
         childSetEnabled("home",use_home);
         childSetEnabled("open",have_url);
         
-#else
-        childSetEnabled("open",have_url);
-#endif
 }
 
 void LLPanelAvatarWeb::load()
@@ -696,7 +677,6 @@ void LLPanelAvatarWeb::onClickOpen(void* data)
         }
 }
 
-#if LL_LIBXUL_ENABLED
 void LLPanelAvatarWeb::onStatusTextChange( const EventType& eventIn )
 {
         childSetText("status_text", eventIn.getStringValue() );
@@ -706,7 +686,6 @@ void LLPanelAvatarWeb::onLocationChange( const EventType& eventIn )
 {
         childSetText("url_edit", eventIn.getStringValue() );
 }
-#endif
 
 
 //-----------------------------------------------------------------------------
@@ -746,7 +725,7 @@ void LLPanelAvatarAdvanced::enableControls(BOOL self)
                 // setEnable is called, for some reason
                 if (mWantToEdit) mWantToEdit->setReadOnlyBgColor(LLColor4::transparent);
                 if (mSkillsEdit) mSkillsEdit->setReadOnlyBgColor(LLColor4::transparent);
-                LLLineEditor* languages_edit = (LLLineEditor*)getChildByName("languages_edit");
+                LLLineEditor* languages_edit = getChild<LLLineEditor>("languages_edit");
                 languages_edit->setReadOnlyBgColor(LLColor4::transparent);
         }
 }
@@ -822,7 +801,7 @@ void LLPanelAvatarNotes::refresh()
 
 void LLPanelAvatarNotes::clearControls()
 {
-        childSetText("notes edit", childGetText("Loading"));
+        childSetText("notes edit", getString("Loading"));
         childSetEnabled("notes edit", false);
 }
 
@@ -849,7 +828,7 @@ void LLPanelAvatarClassified::refresh()
 {
         BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
         
-        LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(this,"classified tab");
+        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this,"classified tab");
         
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
 
@@ -883,7 +862,7 @@ void LLPanelAvatarClassified::refresh()
 
 BOOL LLPanelAvatarClassified::canClose()
 {
-        LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
         for (S32 i = 0; i < tabs->getTabCount(); i++)
         {
                 LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
@@ -897,7 +876,7 @@ BOOL LLPanelAvatarClassified::canClose()
 
 BOOL LLPanelAvatarClassified::titleIsValid()
 {
-        LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
         if ( tabs )
         {
                 LLPanelClassified* panel = (LLPanelClassified*)tabs->getCurrentPanel();
@@ -915,7 +894,7 @@ BOOL LLPanelAvatarClassified::titleIsValid()
 
 void LLPanelAvatarClassified::apply()
 {
-        LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
         for (S32 i = 0; i < tabs->getTabCount(); i++)
         {
                 LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
@@ -926,7 +905,7 @@ void LLPanelAvatarClassified::apply()
 
 void LLPanelAvatarClassified::deleteClassifiedPanels()
 {
-        LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
         if (tabs)
         {
                 tabs->deleteAllTabs();
@@ -946,7 +925,7 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
         char classified_name[DB_PICK_NAME_SIZE];                /*Flawfinder: ignore*/
         LLPanelClassified* panel_classified = NULL;
 
-        LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
 
         // Don't remove old panels.  We need to be able to process multiple
         // packets for people who have lots of classifieds. JC
@@ -957,7 +936,7 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
                 msg->getUUIDFast(_PREHASH_Data, _PREHASH_ClassifiedID, classified_id, block);
                 msg->getStringFast(_PREHASH_Data, _PREHASH_Name, DB_PICK_NAME_SIZE, classified_name, block);
 
-                panel_classified = new LLPanelClassified(FALSE);
+                panel_classified = new LLPanelClassified(false, false);
 
                 panel_classified->setClassifiedID(classified_id);
 
@@ -1002,9 +981,9 @@ void LLPanelAvatarClassified::callbackNew(S32 option, void* data)
 
         if (0 == option)
         {
-                LLPanelClassified* panel_classified = new LLPanelClassified(FALSE);
+                LLPanelClassified* panel_classified = new LLPanelClassified(false, false);
                 panel_classified->initNewClassified();
-                LLTabContainerCommon*   tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
+                LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
                 if(tabs)
                 {
                         tabs->addTabPanel(panel_classified, panel_classified->getClassifiedName());
@@ -1019,7 +998,7 @@ void LLPanelAvatarClassified::onClickDelete(void* data)
 {
         LLPanelAvatarClassified* self = (LLPanelAvatarClassified*)data;
 
-        LLTabContainerCommon*   tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
         LLPanelClassified* panel_classified = NULL;
         if(tabs)
         {
@@ -1038,7 +1017,7 @@ void LLPanelAvatarClassified::onClickDelete(void* data)
 void LLPanelAvatarClassified::callbackDelete(S32 option, void* data)
 {
         LLPanelAvatarClassified* self = (LLPanelAvatarClassified*)data;
-        LLTabContainerCommon*   tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
         LLPanelClassified* panel_classified=NULL;
         if(tabs)
         {
@@ -1083,14 +1062,12 @@ LLPanelAvatarPicks::LLPanelAvatarPicks(const std::string& name,
 void LLPanelAvatarPicks::refresh()
 {
         BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
-
-        LLTabContainerCommon*   tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"picks tab");
+        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"picks tab");
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
-        BOOL allow_new = (tab_count < MAX_AVATAR_PICKS);
-        BOOL allow_delete = (tab_count > 0);
-
-        childSetEnabled("New...",self && allow_new);
-        childSetEnabled("Delete...",self && allow_delete);
+        childSetEnabled("New...",    self && tab_count < MAX_AVATAR_PICKS);
+        childSetEnabled("Delete...", self && tab_count > 0);
+        childSetVisible("New...",    self && getPanelAvatar()->isEditable());
+        childSetVisible("Delete...", self && getPanelAvatar()->isEditable());
 
         sendAvatarProfileRequestIfNeeded("avatarpicksrequest");
 }
@@ -1098,7 +1075,7 @@ void LLPanelAvatarPicks::refresh()
 
 void LLPanelAvatarPicks::deletePickPanels()
 {
-        LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(this,"picks tab");
+        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this,"picks tab");
         if(tabs)
         {
                 tabs->deleteAllTabs();
@@ -1117,7 +1094,7 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
         char pick_name[DB_PICK_NAME_SIZE];              /*Flawfinder: ignore*/
         LLPanelPick* panel_pick = NULL;
 
-        LLTabContainerCommon* tabs =  LLUICtrlFactory::getTabContainerByName(this,"picks tab");
+        LLTabContainer* tabs =  LLUICtrlFactory::getTabContainerByName(this,"picks tab");
 
         // Clear out all the old panels.  We'll replace them with the correct
         // number of new panels.
@@ -1167,7 +1144,7 @@ void LLPanelAvatarPicks::onClickNew(void* data)
 {
         LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
         LLPanelPick* panel_pick = new LLPanelPick(FALSE);
-        LLTabContainerCommon* tabs =  LLUICtrlFactory::getTabContainerByName(self,"picks tab");
+        LLTabContainer* tabs =  LLUICtrlFactory::getTabContainerByName(self,"picks tab");
 
         panel_pick->initNewPick();
         if(tabs)
@@ -1182,7 +1159,7 @@ void LLPanelAvatarPicks::onClickNew(void* data)
 void LLPanelAvatarPicks::onClickDelete(void* data)
 {
         LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
-        LLTabContainerCommon* tabs =  LLUICtrlFactory::getTabContainerByName(self,"picks tab");
+        LLTabContainer* tabs =  LLUICtrlFactory::getTabContainerByName(self,"picks tab");
         LLPanelPick* panel_pick = tabs?(LLPanelPick*)tabs->getCurrentPanel():NULL;
 
         if (!panel_pick) return;
@@ -1200,7 +1177,7 @@ void LLPanelAvatarPicks::onClickDelete(void* data)
 void LLPanelAvatarPicks::callbackDelete(S32 option, void* data)
 {
         LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
-        LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(self,"picks tab");
+        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(self,"picks tab");
         LLPanelPick* panel_pick = tabs?(LLPanelPick*)tabs->getCurrentPanel():NULL;
         LLMessageSystem* msg = gMessageSystem;
 
@@ -1417,7 +1394,7 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
         // Teens don't have this.
         if (mPanelFirstLife) mPanelFirstLife->enableControls(own_avatar && mAllowEdit);
 
-        LLView *target_view = getChildByName("drop_target_rect", TRUE);
+        LLView *target_view = getChild<LLView>("drop_target_rect");
         if(target_view)
         {
                 if (mDropTarget)
@@ -1477,6 +1454,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
                         {
                                 childSetVisible("OK",FALSE);
                                 childSetEnabled("OK",FALSE);
+                                childSetVisible("Cancel",FALSE);
+                                childSetEnabled("Cancel",FALSE);
                         }
                         childSetVisible("Instant Message...",FALSE);
                         childSetEnabled("Instant Message...",FALSE);
@@ -1700,7 +1679,7 @@ void LLPanelAvatar::onClickOK(void *userdata)
         {
                 self->sendAvatarPropertiesUpdate();
 
-                LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(self,"tab");
+                LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(self,"tab");
                 if ( tabs->getCurrentPanel() != self->mPanelClassified )
                 {
                         self->mPanelClassified->apply();
@@ -1767,7 +1746,7 @@ void LLPanelAvatar::sendAvatarNotesUpdate()
         std::string notes = mPanelNotes->childGetValue("notes edit").asString();
 
         if (!mHaveNotes
-                && (notes.empty() || notes == childGetText("Loading")))
+                && (notes.empty() || notes == getString("Loading")))
         {
                 // no notes from server and no user updates
                 return;
@@ -1868,7 +1847,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 if(caption_text.empty())
                 {
                         LLString::format_map_t args;
-                        caption_text = self->mPanelSecondLife->childGetValue("CaptionTextAcctInfo").asString();
+                        caption_text = self->mPanelSecondLife->getString("CaptionTextAcctInfo");
                         
                         const char* ACCT_TYPE[] = {
                                 "AcctTypeResident",
@@ -1877,7 +1856,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                                 "AcctTypeEmployee"
                         };
                         caption_index = llclamp(caption_index, (U8)0, (U8)(sizeof(ACCT_TYPE)/sizeof(ACCT_TYPE[0])-1));
-                        args["[ACCTTYPE]"] = self->mPanelSecondLife->childGetValue(ACCT_TYPE[caption_index]).asString();
+                        args["[ACCTTYPE]"] = self->mPanelSecondLife->getString(ACCT_TYPE[caption_index]);
 
                         LLString payment_text = " ";
                         const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3;
@@ -1895,10 +1874,10 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                                 {
                                         payment_text = "NoPaymentInfoOnFile";
                                 }
-                                args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString();
+                                args["[PAYMENTINFO]"] = self->mPanelSecondLife->getString(payment_text);
                                 LLString age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
                                 // Do not display age verification status at this time
-                                //args["[AGEVERIFICATION]"] = self->mPanelSecondLife->childGetValue(age_text).asString();
+                                //args["[AGEVERIFICATION]"] = self->mPanelSecondLife->getString(age_text);
                                 args["[AGEVERIFICATION]"] = " ";
                         }
                         else
@@ -1918,7 +1897,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
 
                 self->mPanelWeb->setWebURL(std::string(profile_url));
 
-                LLTextureCtrl*  image_ctrl = LLUICtrlFactory::getTexturePickerByName(self->mPanelSecondLife,"img");
+                LLTextureCtrl*  image_ctrl = self->mPanelSecondLife->getChild<LLTextureCtrl>("img");
                 if(image_ctrl)
                 {
                         image_ctrl->setImageAssetID(image_id);
@@ -1932,7 +1911,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 {
                         // Teens don't get these
                         self->mPanelFirstLife->childSetValue("about", fl_about_text);
-                        LLTextureCtrl*  image_ctrl = LLUICtrlFactory::getTexturePickerByName(self->mPanelFirstLife,"img");
+                        LLTextureCtrl*  image_ctrl = self->mPanelFirstLife->getChild<LLTextureCtrl>("img");
                         if(image_ctrl)
                         {
                                 image_ctrl->setImageAssetID(fl_image_id);
@@ -2098,7 +2077,7 @@ void LLPanelAvatar::sendAvatarPropertiesUpdate()
         if (mPanelFirstLife)
         {
                 first_life_about_text = mPanelFirstLife->childGetValue("about").asString();
-                LLTextureCtrl*  image_ctrl = LLUICtrlFactory::getTexturePickerByName(mPanelFirstLife,"img");
+                LLTextureCtrl*  image_ctrl = mPanelFirstLife->getChild<LLTextureCtrl>("img");
                 if(image_ctrl)
                 {
                         first_life_image_id = image_ctrl->getImageAssetID();
@@ -2115,7 +2094,7 @@ void LLPanelAvatar::sendAvatarPropertiesUpdate()
         msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
         msg->nextBlockFast(_PREHASH_PropertiesData);
         
-        LLTextureCtrl*  image_ctrl = LLUICtrlFactory::getTexturePickerByName(mPanelSecondLife,"img");
+        LLTextureCtrl*  image_ctrl = mPanelSecondLife->getChild<LLTextureCtrl>("img");
         if(image_ctrl)
         {
                 msg->addUUIDFast(       _PREHASH_ImageID,       image_ctrl->getImageAssetID());