summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-11-15 17:03:52 -0800
committerRichard Linden <none@none>2010-11-15 17:03:52 -0800
commitd276950c8d4d53f9d5d6497d5a4a4582c499938a (patch)
treef10ed7ac32e501f5e51fb5b16347dad037076e13
parent50d21a75a7c6a41a5a3355a8c4406a33454c70dd (diff)
build fixes
-rw-r--r--indra/llui/lluistring.h2
-rw-r--r--indra/llui/llurlentry.cpp2
-rw-r--r--indra/llui/llurlentry.h2
-rw-r--r--indra/newview/llpaneloutfitedit.cpp10
4 files changed, 5 insertions, 11 deletions
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h
index 35f177238d..cb40c85582 100644
--- a/indra/llui/lluistring.h
+++ b/indra/llui/lluistring.h
@@ -63,8 +63,6 @@ public:
LLUIString(const std::string& instring) : mArgs(NULL) { assign(instring); }
~LLUIString() { delete mArgs; }
- ~LLUIString() { delete mArgs; }
-
void assign(const std::string& instring);
LLUIString& operator=(const std::string& s) { assign(s); return *this; }
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index ebd0f912b8..13bfeb5e2d 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -174,7 +174,7 @@ bool LLUrlEntryBase::isLinkDisabled() const
// this allows us to have a global setting to turn off text hyperlink highlighting/action
bool globally_disabled = LLUI::sSettingGroups["config"]->getBOOL("DisableTextHyperlinkActions");
- return mDisabledLink || globally_disabled;
+ return globally_disabled;
}
static std::string getStringAfterToken(const std::string str, const std::string token)
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 1a16056041..43a667c390 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -94,6 +94,8 @@ public:
virtual LLUUID getID(const std::string &string) const { return LLUUID::null; }
+ bool isLinkDisabled() const;
+
protected:
std::string getIDStringFromUrl(const std::string &url) const;
std::string escapeUrl(const std::string &url) const;
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index ce9b1c66d7..c10c21683b 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -186,14 +186,8 @@ private:
// Populate the menu with items like "New Skin", "New Pants", etc.
static void populateCreateWearableSubmenus(LLMenuGL* menu)
{
- LLView* menu_clothes = gMenuHolder->findChildView("COF.Gear.New_Clothes", FALSE);
- LLView* menu_bp = gMenuHolder->findChildView("COF.Geear.New_Body_Parts", FALSE);
-
- if (!menu_clothes || !menu_bp)
- {
- llassert(menu_clothes && menu_bp);
- return;
- }
+ LLView* menu_clothes = gMenuHolder->getChildView("COF.Gear.New_Clothes", FALSE);
+ LLView* menu_bp = gMenuHolder->getChildView("COF.Geear.New_Body_Parts", FALSE);
for (U8 i = LLWearableType::WT_SHAPE; i != (U8) LLWearableType::WT_COUNT; ++i)
{