7 files changed, 30 insertions, 43 deletions

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 58c1dbc..4bc5277 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -34,7 +34,7 @@
 
 #include "llbutton.h"
 
-// Linden library includes
+// viewer library includes
 #include "v4color.h"
 #include "llstring.h"
 
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index f3ef83e..2546c4e 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -1338,3 +1338,8 @@ void LLFlyoutButton::setToggleState(BOOL state)
         mToggleState = state;
 }
 
+void LLFlyoutButton::setLabel(const LLStringExplicit& name)
+{
+        mActionButton->setLabel(name);
+}
+
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index f92fe44..7384b87 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -225,6 +225,8 @@ public:
         static void             onActionButtonClick(void *userdata);
         static void             onSelectAction(LLUICtrl* ctrl, void *userdata);
 
+        void                    setLabel(const LLStringExplicit& name);
+
 protected:
         LLButton*                               mActionButton;
         LLPointer<LLUIImage>    mActionButtonImage;
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index 0df960e..9b01060 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -34,7 +34,7 @@
 
 #include "lliconctrl.h"
 
-// Linden library includes 
+// viewer library includes 
 
 // Project includes
 #include "llcontrol.h"
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index c8ca5bf..8612427 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -4250,10 +4250,10 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
                                                                          const std::string& font_name)
 {
         LLColor4 lcolor=color;
-        // If LindenUserDir is empty then we didn't login yet.
+        // If ViewerUserDir is empty then we didn't login yet.
         // In that case we can't instantiate LLTextParser, which
         // is initialized per user.
-        if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
+        if (mParseHighlights && !gDirUtilp->getViewerUserDir(true).empty())
         {
                 LLTextParser* highlight = LLTextParser::getInstance();
                 highlight->parseFullLineHighlights(new_text, &lcolor);
@@ -4333,10 +4333,10 @@ void LLTextEditor::appendHighlightedText(const std::string &new_text,
                                                                                  S32  highlight_part,
                                                                                  LLStyleSP stylep)
 {
-        // If LindenUserDir is empty then we didn't login yet.
+        // If ViewerUserDir is empty then we didn't login yet.
         // In that case we can't instantiate LLTextParser, which
         // is initialized per user.
-        if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
+        if (mParseHighlights && !gDirUtilp->getViewerUserDir(true).empty())
         {
                 LLTextParser* highlight = LLTextParser::getInstance();
                 
@@ -4804,20 +4804,20 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
         instream.getline(tbuf, MAX_STRING);
         if( 1 != sscanf(tbuf, "Linden text version %d", &version) )
         {
-                llwarns << "Invalid Linden text file header " << llendl;
+                llwarns << "Invalid Notecard text file header " << llendl;
                 return FALSE;
         }
 
         if( 1 != version )
         {
-                llwarns << "Invalid Linden text file version: " << version << llendl;
+                llwarns << "Invalid Notecard text file version: " << version << llendl;
                 return FALSE;
         }
 
         instream.getline(tbuf, MAX_STRING);
         if( 0 != sscanf(tbuf, "{") )
         {
-                llwarns << "Invalid Linden text file format" << llendl;
+                llwarns << "Invalid Notecard text file format" << llendl;
                 return FALSE;
         }
 
@@ -4825,13 +4825,13 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
         instream.getline(tbuf, MAX_STRING);
         if( 1 != sscanf(tbuf, "Text length %d", &text_len) )
         {
-                llwarns << "Invalid Linden text length field" << llendl;
+                llwarns << "Invalid Notecard text length field" << llendl;
                 return FALSE;
         }
 
         if( text_len > mMaxTextByteLength )
         {
-                llwarns << "Invalid Linden text length: " << text_len << llendl;
+                llwarns << "Invalid Notecard text length: " << text_len << llendl;
                 return FALSE;
         }
 
@@ -4854,7 +4854,7 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
         instream.getline(tbuf, MAX_STRING);
         if( success && (0 != sscanf(tbuf, "}")) )
         {
-                llwarns << "Invalid Linden text file format: missing terminal }" << llendl;
+                llwarns << "Invalid Notecard text file format: missing terminal }" << llendl;
                 success = FALSE;
         }
 
@@ -5119,7 +5119,7 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
 BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end, std::string& url) const
 {
           
-        S32 m1,m2,m3,m4;
+        S32 m1,m2,m3;
         BOOL matched = FALSE;
         
         m1=line.find("://",*end);
@@ -5132,11 +5132,10 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end, std::
                 //Load_url only handles http and https so don't hilite ftp, smb, etc.
                 m2 = line.substr(*begin,(m1 - *begin)).find("http");
                 m3 = line.substr(*begin,(m1 - *begin)).find("secondlife");
-                m4 = line.substr(*begin,(m1 - *begin)).find("inworldz");
         
                 std::string badneighbors=".,<>?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
         
-                if (m2 >= 0 || m3>=0 || m4>=0)
+                if (m2 >= 0 || m3>=0)
                 {
                         S32 bn = badneighbors.find(line.substr(m1+3,1));
                         
@@ -5180,28 +5179,9 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end, std::
                 try
                 {
                         url = line.substr(*begin,*end - *begin);
-                        
-                        // see if it's an izurl
-                        std::string slurlID = "places.inworldz.com/";
+                        std::string slurlID = "slurl.com/secondlife/";
                         strpos = url.find(slurlID);
-                        if (strpos < 0)
-                        {
-                                slurlID="inworldz://";
-                                strpos = url.find(slurlID);
-                        }
-                        if (strpos < 0)
-                        {
-                                slurlID="iz://";
-                                strpos = url.find(slurlID);
-                        }
-        
-                        // see if it's an slurl
-                        if (strpos < 0)
-                        {
-                                slurlID = "slurl.com/secondlife/";
-                                strpos = url.find(slurlID);
-                        }
-
+                        
                         if (strpos < 0)
                         {
                                 slurlID="maps.secondlife.com/secondlife/";
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 75a4467..dfef4bc 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -37,7 +37,7 @@
 #include <string>
 #include <map>
 
-// Linden library includes
+// viewer library includes
 #include "v2math.h"
 #include "v4color.h"
 #include "llrender.h"
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h
index aedeca2..adc2e08 100644
--- a/linden/indra/llui/lluistring.h
+++ b/linden/indra/llui/lluistring.h
@@ -45,14 +45,14 @@
 //  the correct result
 
 // Example Usage:
-// LLUIString mMessage("Welcome [USERNAME] to [SECONDLIFE]!");
+// LLUIString mMessage("Welcome [USERNAME] to [GRIDNAME]!");
 // mMessage.setArg("[USERNAME]", "Steve");
-// mMessage.setArg("[SECONDLIFE]", "Second Life");
-// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life"
+// mMessage.setArg("[GRIDNAME]", "This Grid");
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to This Grid"
 // mMessage.setArg("[USERNAME]", "Joe");
-// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life"
-// mMessage = "Recepci￳n a la [SECONDLIFE] [USERNAME]"
-// mMessage.setArg("[SECONDLIFE]", "Segunda Vida");
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to This Grid"
+// mMessage = "Recepci￳n a la [GRIDNAME] [USERNAME]"
+// mMessage.setArg("[GRIDNAME]", "Segunda Vida");
 // llinfos << mMessage.getString() << llendl; // outputs "Recepci￳n a la Segunda Vida Joe"
 
 // Implementation Notes: