111 files changed, 233 insertions, 243 deletions

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index c909a1b..af7e42f 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -694,7 +694,7 @@ Usage:   develop.py [options] [command [command-options]]
 
 Options:
   -h | --help           print this help message
-       --standalone     build standalone, without Linden prebuild libraries
+       --standalone     build standalone, without prebuild libraries
        --unattended     build unattended, do not invoke any tools requiring
                         a human response
        --universal      build a universal binary on Mac OS X (unsupported)
diff --git a/linden/indra/llcommon/indra_constants.cpp b/linden/indra/llcommon/indra_constants.cpp
index 64cbb11..1ab47d0 100644
--- a/linden/indra/llcommon/indra_constants.cpp
+++ b/linden/indra/llcommon/indra_constants.cpp
@@ -40,8 +40,5 @@
 const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 
 // Governor Linden's agent id.
+// FIXME for meta-impy: Gotta get rid of this.
 const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f");
-const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1");
-// Maintenance's group id.
-const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd");
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 2fa2cdf..e64ee62 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -267,13 +267,9 @@ const U8 GOD_NOT = 0;
 LL_COMMON_API extern const LLUUID LL_UUID_ALL_AGENTS;
 
 // inventory library owner
+// FIXME for meta-impy: Gotta get rid of this.
 LL_COMMON_API extern const LLUUID ALEXANDRIA_LINDEN_ID;
 
-LL_COMMON_API extern const LLUUID GOVERNOR_LINDEN_ID;
-LL_COMMON_API extern const LLUUID REALESTATE_LINDEN_ID;
-// Maintenance's group id.
-LL_COMMON_API extern const LLUUID MAINTENANCE_GROUP_ID;
-
 // Flags for kick message
 const U32 KICK_FLAGS_DEFAULT    = 0x0;
 const U32 KICK_FLAGS_FREEZE             = 1 << 0;
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index bf844b9..cfb2dce 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -82,7 +82,7 @@
 // moved msvc warnings to llpreprocessor.h  *TODO - delete this comment after merge conflicts are unlikely -brad
 #endif  //      LL_WINDOWS
 
-// Linden only libs in alpha-order other than stdtypes.h
+// Viewer only libs in alpha-order other than stdtypes.h
 // *NOTE: Please keep includes here to a minimum, see above.
 #include "stdtypes.h"
 #include "lldefs.h"
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index 9f611ae..5465cc3 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -50,12 +50,12 @@ public:
                 AT_SOUND = 1, 
 
                 // Links instant message access to the user on the card. eg, a
-                // card for yourself, a card for linden support, a card for
+                // card for yourself, a card for grid support, a card for
                 // the guy you were talking to in the coliseum.
                 AT_CALLINGCARD = 2,
 
                 // Links to places in the world with location and a screen
-                // shot or image saved. eg, home, linden headquarters, the
+                // shot or image saved. eg, home, grid headquarters, the
                 // coliseum, or destinations where we want to increase
                 // traffic.
                 AT_LANDMARK = 3,
diff --git a/linden/indra/llcommon/llavatarname.cpp b/linden/indra/llcommon/llavatarname.cpp
index ebe8c88..4a2c7ab 100644
--- a/linden/indra/llcommon/llavatarname.cpp
+++ b/linden/indra/llcommon/llavatarname.cpp
@@ -1,7 +1,7 @@
 /** 
  * @file llavatarname.cpp
  * @brief Represents name-related data for an avatar, such as the
- * username/SLID ("bobsmith123" or "james.linden") and the display
+ * username/SLID ("bobsmith123" or "james.green") and the display
  * name ("James Cook")
  *
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
diff --git a/linden/indra/llcommon/llavatarname.h b/linden/indra/llcommon/llavatarname.h
index 3b6c6ea..1e141dc 100644
--- a/linden/indra/llcommon/llavatarname.h
+++ b/linden/indra/llcommon/llavatarname.h
@@ -1,7 +1,7 @@
 /** 
  * @file llavatarname.h
  * @brief Represents name-related data for an avatar, such as the
- * username/SLID ("bobsmith123" or "james.linden") and the display
+ * username/SLID ("bobsmith123" or "james.green") and the display
  * name ("James Cook")
  *
  * $LicenseInfo:firstyear=2010&license=viewerlgpl$
@@ -43,8 +43,8 @@ public:
 
         void fromLLSD(const LLSD& sd);
 
-        // For normal names, returns "James Linden (james.linden)"
-        // When display names are disabled returns just "James Linden"
+        // For normal names, returns "James Green (james.green)"
+        // When display names are disabled returns just "James Green"
         std::string getCompleteName() const;
 
         // For normal names, returns "Whatever Display Name (John Doe)" when
@@ -55,31 +55,31 @@ public:
         // line feed.
         std::string getNames(bool linefeed = false) const;
 
-        // Returns "James Linden" or "bobsmith123 Resident" for backwards
+        // Returns "James Green" or "bobsmith123 Resident" for backwards
         // compatibility with systems like voice and muting
         std::string getLegacyName() const;
 
-        // "bobsmith123" or "james.linden", US-ASCII only
+        // "bobsmith123" or "james.green", US-ASCII only
         std::string mUsername;
 
-        // "Jose' Sanchez" or "James Linden", UTF-8 encoded Unicode
+        // "Jose' Sanchez" or "James Green", UTF-8 encoded Unicode
         // Contains data whether or not user has explicitly set
         // a display name; may duplicate their username.
         std::string mDisplayName;
 
-        // For "James Linden", "James"
+        // For "James Green", "James"
         // For "bobsmith123", "bobsmith123"
         // Used to communicate with legacy systems like voice and muting which
         // rely on old-style names.
         std::string mLegacyFirstName;
 
-        // For "James Linden", "Linden"
+        // For "James Green", "Green"
         // For "bobsmith123", "Resident"
         // see above for rationale
         std::string mLegacyLastName;
 
         // If true, both display name and SLID were generated from
-        // a legacy first and last name, like "James Linden (james.linden)"
+        // a legacy first and last name, like "James Green (james.green)"
         bool mIsDisplayNameDefault;
 
         // Under error conditions, we may insert "dummy" records with
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 6886e3a..29d90ba 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -1,6 +1,6 @@
 /** 
  * @file llpreprocessor.h
- * @brief This file should be included in all Linden Lab files and
+ * @brief This file should be included in all viewer files and
  * should only contain special preprocessor directives
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index 854a153..b3107e7 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -89,7 +89,7 @@ const U64 GP_GROUP_CHANGE_IDENTITY = 0x1 << 11;	// Charter, insignia, 'Show In G
 
 // Parcel Management
 const U64 GP_LAND_DEED                  = 0x1 << 12;    // Deed Land and Buy Land for Group
-const U64 GP_LAND_RELEASE                       = 0x1 << 13;    // Release Land (to Gov. Linden)
+const U64 GP_LAND_RELEASE                       = 0x1 << 13;    // Release Land (abandon it back to the grid owners)
 const U64 GP_LAND_SET_SALE_INFO = 0x1 << 14;    // Set for sale info (Toggle "For Sale", Set Price, Set Target, Toggle "Sell objects with the land")
 const U64 GP_LAND_DIVIDE_JOIN           = 0x1 << 15;    // Divide and Join Parcels
 
@@ -126,7 +126,7 @@ const U64 GP_LAND_RETURN		= GP_LAND_RETURN_GROUP_OWNED
                                                                 | GP_LAND_RETURN_GROUP_SET      
                                                                 | GP_LAND_RETURN_NON_GROUP;
 
-const U64 GP_LAND_GARDENING             = 0x1LL << 35;  // Parcel Gardening - plant and move linden trees
+const U64 GP_LAND_GARDENING             = 0x1LL << 35;  // Parcel Gardening - plant and move tree prims
 
 // Object Management
 const U64 GP_OBJECT_DEED                        = 0x1LL << 36;  // Deed Object
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 9e7e043..f7e3632 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -61,7 +61,7 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
         str >> std::ws >> "LLEmbeddedItems version" >> mEmbeddedVersion >> "\n";
         if (str.fail())
         {
-                llwarns << "Invalid Linden text file header" << llendl;
+                llwarns << "Invalid notecard text file header" << llendl;
                 goto import_file_failed;
         }
 
@@ -74,7 +74,7 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
         str >> std::ws >> "{\n";
         if(str.fail())
         {
-                llwarns << "Invalid Linden text file format: missing {" << llendl;
+                llwarns << "Invalid notecard text file format: missing {" << llendl;
                 goto import_file_failed;
         }
 
@@ -165,20 +165,20 @@ bool LLNotecard::importStream(std::istream& str)
         str >> std::ws >> "Linden text version " >> mVersion >> "\n";
         if(str.fail())
         {
-                llwarns << "Invalid Linden text file header " << llendl;
+                llwarns << "Invalid notecard text file header " << llendl;
                 return FALSE;
         }
 
         if( 1 != mVersion && 2 != mVersion)
         {
-                llwarns << "Invalid Linden text file version: " << mVersion << llendl;
+                llwarns << "Invalid notecard text file version: " << mVersion << llendl;
                 return FALSE;
         }
 
         str >> std::ws >> "{\n";
         if(str.fail())
         {
-                llwarns << "Invalid Linden text file format" << llendl;
+                llwarns << "Invalid notecard text file format" << llendl;
                 return FALSE;
         }
 
@@ -191,7 +191,7 @@ bool LLNotecard::importStream(std::istream& str)
         str.getline(line_buf, STD_STRING_BUF_SIZE);
         if(str.fail())
         {
-                llwarns << "Invalid Linden text length field" << llendl;
+                llwarns << "Invalid notecard text length field" << llendl;
                 return FALSE;
         }
         line_buf[STD_STRING_STR_LEN] = '\0';
@@ -199,13 +199,13 @@ bool LLNotecard::importStream(std::istream& str)
         S32 text_len = 0;
         if( 1 != sscanf(line_buf, "Text length %d", &text_len) )
         {
-                llwarns << "Invalid Linden text length field" << llendl;
+                llwarns << "Invalid notecard text length field" << llendl;
                 return FALSE;
         }
 
         if(text_len > mMaxText)
         {
-                llwarns << "Invalid Linden text length: " << text_len << llendl;
+                llwarns << "Invalid notecard text length: " << text_len << llendl;
                 return FALSE;
         }
 
@@ -215,7 +215,7 @@ bool LLNotecard::importStream(std::istream& str)
         fullread(str, text, text_len);
         if(str.fail())
         {
-                llwarns << "Invalid Linden text: text shorter than text length: " << text_len << llendl;
+                llwarns << "Invalid notecard text: text shorter than text length: " << text_len << llendl;
                 success = FALSE;
         }
         text[text_len] = '\0';
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 8faa673..0af9ab7 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -632,7 +632,7 @@ protected:
         F32                                     mDiscountRate;                  // 0.0-1.0
         F32                                     mDrawDistance;
         U32                                     mParcelFlags;
-        S32                                     mSalePrice;                             // linden dollars
+        S32                                     mSalePrice;                             // in world currency
         std::string                     mName;
         std::string                     mDesc;
         std::string                     mMusicURL;
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index 0ab1081..fd1dd95 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -38,7 +38,7 @@
 
 #include "llassetstorage.h"
 
-// linden library includes
+// viewer library includes
 #include "llmath.h"
 #include "llstring.h"
 #include "lldir.h"
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 88a0cfe..db81e8c 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -34,7 +34,7 @@
 
 #include "llcachename.h"
 
-// linden library includes
+// viewer library includes
 #include "lldbstrings.h"
 #include "llframetimer.h"
 #include "llhost.h"
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 686c037..150b771 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -597,7 +597,7 @@ LLIOPipe::EStatus LLIOServerSocket::process_impl(
         else
         {
                 char buf[256];
-                llwarns << "Unable to accept linden socket: " << apr_strerror(status, buf, sizeof(buf)) << llendl;
+                llwarns << "Unable to accept server socket: " << apr_strerror(status, buf, sizeof(buf)) << llendl;
         }
 
         PUMP_DEBUG;
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 7dcb606..7f9617f 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -34,7 +34,7 @@
 
 #include "llpacketring.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "lltimer.h"
 #include "timing.h"
diff --git a/linden/indra/llmessage/lltaskname.h b/linden/indra/llmessage/lltaskname.h
index 401d355..305b31a 100644
--- a/linden/indra/llmessage/lltaskname.h
+++ b/linden/indra/llmessage/lltaskname.h
@@ -44,7 +44,7 @@
 typedef enum e_lltask_name
 {
         LLTASK_NULL                             = 0, // Not a valid task
-        LLTASK_AGENT                    = 1, // The player's agent in Linden World
+        LLTASK_AGENT                    = 1, // The player's agent in world
         LLTASK_CHILD_AGENT              = 2, // Child agents sent to adjacent regions
 //      LLTASK_BASIC_SHOT,              // Simple shot that moves in a straight line
 //      LLTASK_BIG_SHOT,                // Big shot that uses gravity
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 53036bc..9a80d7b 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -51,7 +51,7 @@
 #include "apr_network_io.h"
 #include "apr_poll.h"
 
-// linden library headers
+// viewer library headers
 #include "indra_constants.h"
 #include "lldarray.h"
 #include "lldir.h"
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index e6391d9..660cd2b 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -304,8 +304,7 @@ public:
         S32 getErrorCode() const { return mErrorCode; }
 
         // Read file and build message templates filename must point to a
-        // valid string which specifies the path of a valid linden
-        // template.
+        // valid string which specifies the path of a valid template.
         void loadTemplateFile(const std::string& filename, bool failure_is_fatal);
 
 
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index f63faa5..7166271 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -50,7 +50,7 @@
         #include <errno.h>
 #endif
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llhost.h"
 #include "lltimer.h"
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 5ee3929..2ca1984 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -49,7 +49,7 @@
 #include "llerror.h"
 #include "llimage.h"
 //#include "llimagej2c.h"
-#include "llmath.h"     // Linden math
+#include "llmath.h"
 #include "llstring.h"
 //#include "imdebug.h"
 #include "llfontbitmapcache.h"
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 702e34e..e6b86c9 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/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 004d063..40dafcd 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -4206,10 +4206,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);
@@ -4289,10 +4289,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();
                 
@@ -4760,20 +4760,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;
         }
 
@@ -4781,13 +4781,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;
         }
 
@@ -4810,7 +4810,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;
         }
 
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/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 81de54f..8bd68f4 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -69,7 +69,7 @@ LLDir::LLDir()
         mAppRODataDir(""),
         mOSUserDir(""),
         mOSUserAppDir(""),
-        mLindenUserDir(""),
+        mViewerUserDir(""),
         mOSCacheDir(""),
         mCAFile(""),
         mTempDir(""),
@@ -193,10 +193,10 @@ const std::string &LLDir::getOSUserAppDir() const
         return mOSUserAppDir;
 }
 
-const std::string &LLDir::getLindenUserDir(bool empty_ok) const
+const std::string &LLDir::getViewerUserDir(bool empty_ok) const
 {
-        llassert(empty_ok || !mLindenUserDir.empty());
-        return mLindenUserDir;
+        llassert(empty_ok || !mViewerUserDir.empty());
+        return mViewerUserDir;
 }
 
 const std::string &LLDir::getChatLogsDir() const
@@ -353,7 +353,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
                 break;
 
         case LL_PATH_PER_SL_ACCOUNT:
-                prefix = getLindenUserDir();
+                prefix = getViewerUserDir();
                 break;
                 
         case LL_PATH_CHAT_LOGS:
@@ -543,7 +543,7 @@ std::string LLDir::getForbiddenFileChars()
         return "\\/:*?\"<>|";
 }
 
-void LLDir::setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last)
+void LLDir::setViewerUserDir(const std::string &grid, const std::string &first, const std::string &last)
 {
         // if both first and last aren't set, assume we're grabbing the cached dir
         if (!first.empty() && !last.empty())
@@ -554,23 +554,23 @@ void LLDir::setLindenUserDir(const std::string &grid, const std::string &first,
                 LLStringUtil::toLower(firstlower);
                 std::string lastlower(last);
                 LLStringUtil::toLower(lastlower);
-                mLindenUserDir = getOSUserAppDir();
-                mLindenUserDir += mDirDelimiter;
-                mLindenUserDir += firstlower;
-                mLindenUserDir += "_";
-                mLindenUserDir += lastlower;
+                mViewerUserDir = getOSUserAppDir();
+                mViewerUserDir += mDirDelimiter;
+                mViewerUserDir += firstlower;
+                mViewerUserDir += "_";
+                mViewerUserDir += lastlower;
 
                 if (!grid.empty())
                 {
                         std::string gridlower(grid);
                         LLStringUtil::toLower(gridlower);
-                        mLindenUserDir += "@";
-                        mLindenUserDir += gridlower;
+                        mViewerUserDir += "@";
+                        mViewerUserDir += gridlower;
                 }
         }
         else
         {
-                llerrs << "Invalid name for LLDir::setLindenUserDir" << llendl;
+                llerrs << "Invalid name for LLDir::setViewerUserDir" << llendl;
         }
 
         dumpCurrentDirectories();       
@@ -679,7 +679,7 @@ void LLDir::dumpCurrentDirectories()
         LL_DEBUGS2("AppInit","Directories") << "  AppRODataDir:          " << getAppRODataDir() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  OSUserDir:             " << getOSUserDir() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  OSUserAppDir:          " << getOSUserAppDir() << LL_ENDL;
-        LL_DEBUGS2("AppInit","Directories") << "  LindenUserDir:         " << getLindenUserDir() << LL_ENDL;
+        LL_DEBUGS2("AppInit","Directories") << "  ViewerUserDir:         " << getViewerUserDir() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  TempDir:               " << getTempDir() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  CAFile:                                " << getCAFile() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  SkinDir:               " << getSkinDir() << LL_ENDL;
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 8f8ac77..1a0c6cc 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -92,7 +92,7 @@ class LLDir
         const std::string &getAppRODataDir() const;     // Location of read-only data files
         const std::string &getOSUserDir() const;                // Location of the os-specific user dir
         const std::string &getOSUserAppDir() const;     // Location of the os-specific user app dir
-        const std::string &getLindenUserDir(bool empty_ok = false) const;       // Location of the Linden user dir.
+        const std::string &getViewerUserDir(bool empty_ok = false) const;       // Location of the viewer user dir.
         const std::string &getChatLogsDir() const;      // Location of the chat logs dir.
         const std::string &getPerAccountChatLogsDir() const;    // Location of the per account chat logs dir.
         const std::string &getTempDir() const;                  // Common temporary directory
@@ -131,7 +131,7 @@ class LLDir
 
         virtual void setChatLogsDir(const std::string &path);           // Set the chat logs dir to this user's dir
         virtual void setPerAccountChatLogsDir(const std::string &grid, const std::string &first, const std::string &last);              // Set the per user chat log directory.
-        virtual void setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last);              // Set the linden user dir to this user's dir
+        virtual void setViewerUserDir(const std::string &grid, const std::string &first, const std::string &last);              // Set the viewer user dir to this user's dir
         virtual void setSkinFolder(const std::string &skin_folder);
         virtual bool setCacheDir(const std::string &path);
 
@@ -149,7 +149,7 @@ protected:
         std::string mAppRODataDir;                       // Location for static app data
         std::string mOSUserDir;                  // OS Specific user directory
         std::string mOSUserAppDir;                       // OS Specific user app directory
-        std::string mLindenUserDir;              // Location for Linden user-specific data
+        std::string mViewerUserDir;              // Location for Viewer user-specific data
         std::string mPerAccountChatLogsDir;              // Location for chat logs.
         std::string mChatLogsDir;                // Location for chat logs.
         std::string mCAFile;                             // Location of the TLS certificate authority PEM file.
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index 5f1eabb..84fd4bd 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -97,7 +97,7 @@ LLDir_Linux::LLDir_Linux()
         mAppRODataDir = tmp_str;
         mOSUserDir = getCurrentUserHome(tmp_str);
         mOSUserAppDir = "";
-        mLindenUserDir = "";
+        mViewerUserDir = "";
 
         char path [32]; /* Flawfinder: ignore */ 
 
diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp
index 5132455..34c14a5 100644
--- a/linden/indra/llvfs/lldir_solaris.cpp
+++ b/linden/indra/llvfs/lldir_solaris.cpp
@@ -100,7 +100,7 @@ LLDir_Solaris::LLDir_Solaris()
         mAppRODataDir = strdup(tmp_str);
         mOSUserDir = getCurrentUserHome(tmp_str);
         mOSUserAppDir = "";
-        mLindenUserDir = "";
+        mViewerUserDir = "";
 
         char path [LL_MAX_PATH];        /* Flawfinder: ignore */ 
 
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index 34ec445..34d089b 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -39,7 +39,7 @@
  * These functions are broken out into a separate file because the
  * objective-C typedef for 'BOOL' conflicts with the one in
  * llcommon/stdtypes.h.  This makes it impossible to use the standard
- * linden headers with any objective-C++ source.
+ * viewer headers with any objective-C++ source.
  */
 
 #include "llwindowmacosx-objc.h"
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 85574e6..01d37f1 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7697,7 +7697,7 @@
     <key>LoginAsGod</key>
     <map>
       <key>Comment</key>
-      <string>Attempt to login with god powers (Linden accounts only)</string>
+      <string>Attempt to login with god powers (grid staff accounts only)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp
index e8cd4f3..5397590 100644
--- a/linden/indra/newview/floatervoicelicense.cpp
+++ b/linden/indra/newview/floatervoicelicense.cpp
@@ -41,7 +41,7 @@
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
 
-// linden library includes
+// viewer library includes
 #include "llbutton.h"
 #include "llhttpclient.h"
 #include "llhttpstatuscodes.h"  // for HTTP_FOUND
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index ee79954..27131ba 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -62,7 +62,7 @@ SetOverwrite on							; stomp files by default
 AutoCloseWindow true                                    ; after all files install, close window
 
 InstallDir "$PROGRAMFILES\${INSTNAME}"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\${INSTNAME}" ""
 !ifdef UPDATE
 DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)
 !else
@@ -88,7 +88,7 @@ Var INSTSHORTCUT
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function PostInstallExe
 push $0
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "PostInstallExe"
   ;MessageBox MB_OK '$0'
   ExecWait '$0'
 pop $0
@@ -108,19 +108,19 @@ push $R0
   StrCpy $INSTPROG "$R0"
   StrCpy $INSTEXE "$R0.exe"
 
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" ""
   ; If key doesn't exist, skip install
   IfErrors ABORT
   StrCpy $INSTDIR "$0"
 
   ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Flags"
   IfErrors +2
   StrCpy $INSTFLAGS "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Shortcut"
   IfErrors +2
   StrCpy $INSTSHORTCUT "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Exe"
   IfErrors +2
   StrCpy $INSTEXE "$0"
   Goto FINISHED
@@ -148,19 +148,19 @@ push $R0
   StrCpy $INSTPROG "$R0"
   StrCpy $INSTEXE "$R0.exe"
 
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" ""
   ; If key doesn't exist, skip install
   IfErrors ABORT
   StrCpy $INSTDIR "$0"
 
   ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Flags"
   IfErrors +2
   StrCpy $INSTFLAGS "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Shortcut"
   IfErrors +2
   StrCpy $INSTSHORTCUT "$0"
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Exe"
   IfErrors +2
   StrCpy $INSTEXE "$0"
   Goto FINISHED
@@ -195,7 +195,7 @@ Function RemoveNSIS
   Push $0
   ; Grab the installation directory of the old version
   DetailPrint $(RemoveOldNSISVersion)
-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" ""
 
   ; If key doesn't exist, skip uninstall
   IfErrors NO_NSIS
@@ -271,7 +271,7 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function CheckIfAlreadyCurrent
   Push $0
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"
+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Version"
     StrCmp $0 ${VERSION_LONG} 0 DONE
         MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE
     Quit
@@ -621,9 +621,9 @@ SetShellVarContext all
 Call un.CloseSecondLife
 
 ; Clean up registry keys (these should all be !defines somewhere)
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"
-DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 
+DeleteRegKey HKEY_LOCAL_MACHINE "Software\meta-impy\Installer Language" 
 
 ; Clean up shortcuts
 Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
@@ -863,7 +863,7 @@ FunctionEnd
 Function .onInit
 
         ; read the language from registry (ok if not there) and set langauge menu
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\${INSTNAME}" "InstallerLanguage"
         StrCpy $LANGUAGE $0
 
         Push ""
@@ -882,14 +882,14 @@ Function .onInit
                 Abort
 
         ; save language in registry             
-        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE
+        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\${INSTNAME}" "InstallerLanguage" $LANGUAGE
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 Function un.onInit
 
         ; read language from registry and set for ininstaller
-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\${INSTNAME}" "InstallerLanguage"
         StrCpy $LANGUAGE $0
 
 FunctionEnd
@@ -992,11 +992,11 @@ CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Write registry
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"
-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "" "$INSTDIR"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Version" "${VERSION_LONG}"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Flags" "$INSTFLAGS"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Shortcut" "$INSTSHORTCUT"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\meta-impy\$INSTPROG" "Exe" "$INSTEXE"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'
 
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 515d588..004cca1 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -6030,7 +6030,7 @@ void LLAgent::setHomePosRegion( const U64& region_handle, const LLVector3& pos_r
 
 void LLAgent::takeHomeScreenshot()
 {
-        std::string snap_filename = gDirUtilp->getLindenUserDir();
+        std::string snap_filename = gDirUtilp->getViewerUserDir();
         snap_filename += gDirUtilp->getDirDelimiter();
         snap_filename += SCREEN_HOME_FILENAME;
         gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5826041..83c1cfe 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3305,7 +3305,7 @@ void LLAppViewer::saveFinalSnapshot()
                 gSavedSettings.setBOOL("ShowParcelOwners", FALSE);
                 idle();
 
-                std::string snap_filename = gDirUtilp->getLindenUserDir(true);
+                std::string snap_filename = gDirUtilp->getViewerUserDir(true);
                 if (!snap_filename.empty())
                 {
                         snap_filename += gDirUtilp->getDirDelimiter();
diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index 5905bb0..c9020f5 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -35,7 +35,7 @@
 // File include
 #include "llcolorswatch.h"
 
-// Linden library includes
+// viewer library includes
 #include "v4color.h"
 
 // Project includes
diff --git a/linden/indra/newview/llcommandhandler.h b/linden/indra/newview/llcommandhandler.h
index 5cb3ee7..b357ead 100644
--- a/linden/indra/newview/llcommandhandler.h
+++ b/linden/indra/newview/llcommandhandler.h
@@ -42,7 +42,7 @@ class LLFooHandler : public LLCommandHandler
 public:
     // Inform the system you handle commands starting
         // with "foo" and they are only allowed from
-        // "trusted" (pointed at Linden content) browsers
+        // "trusted" browsers
         LLFooHandler() : LLCommandHandler("foo", true) { }
 
     // Your code here
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 2379da3..4b3bac3 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -34,7 +34,7 @@
 
 #include "llconsole.h"
 
-// linden library includes
+// viewer library includes
 #include "llviewercontrol.h"
 #include "llcriticaldamp.h"
 #include "llfontgl.h"
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index ec4e294..1839cb3 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -1305,7 +1305,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename
                 << "]" << llendl;
         if (!filename.empty())
         {
-                mFiles.push_back(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + filename);
+                mFiles.push_back(gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter() + filename);
                 return TRUE;
         }
         return FALSE;
@@ -1316,7 +1316,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter )
         reset();
         
         // HACK: Static filenames for 'open' until we implement filepicker
-        std::string filename = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + "upload";
+        std::string filename = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter() + "upload";
         switch (filter)
         {
         case FFLOAD_WAV: filename += ".wav"; break;
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 75cf176..4af21b6 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -569,7 +569,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
                                                                 && selected_id != gAgent.getID() 
                                                                 && selected_speakerp.notNull() 
                                                                 && selected_speakerp->mType != LLSpeaker::SPEAKER_EXTERNAL
-                                                                && !LLMuteList::getInstance()->isLinden(selected_speakerp->mDisplayName));
+                                                                && !LLMuteList::getInstance()->isGod(selected_speakerp->mDisplayName));
         }
         childSetValue("speaker_volume", gVoiceClient->getUserVolume(selected_id));
         childSetEnabled("speaker_volume", LLVoiceClient::voiceEnabled()
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 13805fb..62e4d95 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -42,7 +42,7 @@
 #include "llpanelavatar.h"
 #include "lluictrlfactory.h"
 
-// linden library includes
+// viewer library includes
 #include "llinventory.h"
 #include "lluuid.h"
 #include "message.h"
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index 8288c58..087c53c 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -825,7 +825,7 @@ void LLFloaterBuyLandUI::updateNames()
         
         if (mIsClaim)
         {
-                mParcelSellerName = "Linden Lab";
+                mParcelSellerName = "grid owners";
         }
         else if (parcelp->getIsGroupOwned())
         {
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index e9ea14b..12c1d31 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -194,7 +194,7 @@ void LLFloaterChat::setMinimized(BOOL minimized)
         updateConsoleVisibility();
 }
 
-// linden library includes
+// viewer library includes
 #include "llaudioengine.h"
 #include "llchat.h"
 #include "llfontgl.h"
diff --git a/linden/indra/newview/llfloaterclassified.cpp b/linden/indra/newview/llfloaterclassified.cpp
index 0760303..25f4339 100644
--- a/linden/indra/newview/llfloaterclassified.cpp
+++ b/linden/indra/newview/llfloaterclassified.cpp
@@ -39,7 +39,7 @@
 #include "llcommandhandler.h"
 #include "llpanelclassified.h"
 
-// linden library includes
+// viewer library includes
 #include "lluuid.h"
 #include "lluictrlfactory.h"
 
diff --git a/linden/indra/newview/llfloaterevent.cpp b/linden/indra/newview/llfloaterevent.cpp
index 0ec2a76..ad9ae54 100644
--- a/linden/indra/newview/llfloaterevent.cpp
+++ b/linden/indra/newview/llfloaterevent.cpp
@@ -39,7 +39,7 @@
 #include "llcommandhandler.h"
 #include "llpanelevent.h"
 
-// linden library includes
+// viewer library includes
 #include "lluuid.h"
 #include "lluictrlfactory.h"
 
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
index 6324b56..10bb595 100644
--- a/linden/indra/newview/llfloaterhud.cpp
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -39,7 +39,7 @@
 #include "llmediactrl.h"
 #include "llalertdialog.h"
 
-// Linden libs
+// other viewer libs
 #include "lluictrlfactory.h"
 
 // statics 
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index 960eebb..fd39621 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llfloaterjoystick.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llrect.h"
 #include "llstring.h"
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index 9e8e94b..92234de 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -51,7 +51,7 @@
 #include "llstring.h"
 #include "lleconomy.h"
 
-// linden includes
+// viewer includes
 #include "llassetstorage.h"
 #include "llinventorytype.h"
 
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 15f278d..7f6386b 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -37,7 +37,7 @@
 // self include
 #include "llfloaterreporter.h"
 
-// linden library includes
+// viewer library includes
 #include "llassetstorage.h"
 #include "llcachename.h"
 #include "llfontgl.h"
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index ac4a06b..748139d 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -42,7 +42,7 @@
 #include "llviewertexteditor.h"

 #include "llviewerwindow.h"

 

-// linden library includes

+// viewer library includes

 #include "llbutton.h"

 #include "llhttpclient.h"

 #include "llhttpstatuscodes.h"  // for HTTP_FOUND

diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index b2f4c22..b4faf25 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -354,7 +354,7 @@ void LLHoverView::updateText()
                                         mText.push_back( nodep->mDescription );
                                 }
 
-                                // Line: "Owner: James Linden"
+                                // Line: "Owner: James Green"
                                 line.clear();
                                 line.append(LLTrans::getString("TooltipOwner") + " ");
 
@@ -569,7 +569,7 @@ void LLHoverView::updateText()
                 }
                 mText.push_back(line);
 
-                // Line: "Owner: James Linden"
+                // Line: "Owner: James Green"
                 line.clear();
                 line.append(LLTrans::getString("TooltipOwner") + " ");
 
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 02f6a82..ea4070b 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -580,7 +580,7 @@ void LLIMMgr::addMessage(
         // don't process muted IMs
         if (LLMuteList::getInstance()->isMuted(
                         other_participant_id,
-                        LLMute::flagTextChat) && !LLMuteList::getInstance()->isLinden(from))
+                        LLMute::flagTextChat) && !LLMuteList::getInstance()->isGod(from))
         {
                 return;
         }
@@ -1363,7 +1363,7 @@ void LLIMMgr::saveIgnoreGroup()
 {
         // llinfos << "saving ignore_groups.xml" << llendl;
 
-        std::string user_dir = gDirUtilp->getLindenUserDir(true);
+        std::string user_dir = gDirUtilp->getViewerUserDir(true);
         if (!user_dir.empty())
         {
                 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "ignore_groups.xml");
@@ -1655,7 +1655,7 @@ public:
                                 name,
                                 LLMute::flagTextChat);
 
-                        BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
+                        BOOL is_god = LLMuteList::getInstance()->isGod(name);
                         std::string separator_string(": ");
                         int message_offset=0;
 
@@ -1667,11 +1667,11 @@ public:
                                 message_offset = 3;
                         }
                         
-                        chat.mMuted = is_muted && !is_linden;
+                        chat.mMuted = is_muted && !is_god;
                         chat.mFromID = from_id;
                         chat.mFromName = name;
 
-                        if (!is_linden && (is_busy || is_muted))
+                        if (!is_god && (is_busy || is_muted))
                         {
                                 return;
                         }
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 2539203..112d578 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -198,7 +198,7 @@ private:
 
         // This simple method just iterates through all of the ids, and
         // prints a simple message if they are not online. Used to help
-        // reduce 'hello' messages to the linden employees unlucky enough
+        // reduce 'hello' messages to the grid employees unlucky enough
         // to have their calling card in the default inventory.
         void noteOfflineUsers(LLFloaterIMPanel* panel, const LLDynamicArray<LLUUID>& ids);
         void noteMutedUsers(LLFloaterIMPanel* panel, const LLDynamicArray<LLUUID>& ids);
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index b38abe4..0c79a35 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -641,7 +641,7 @@ void LLManipScale::renderFaces( const LLBBox& bbox )
                 (orientWRTHead.mV[1] < 0.0f ? 2 : 0) + 
                 (orientWRTHead.mV[2] < 0.0f ? 4 : 0);
 
-        // opposite faces on Linden cubes:
+        // opposite faces on cubes:
         // 0 & 5
         // 1 & 3
         // 2 & 4
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 8484c4e..3e1536f 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -2108,7 +2108,7 @@ void LLManipTranslate::renderTranslationHandles()
                                 (orientWRTHead.mV[1] < 0.0f ? 2 : 0) + 
                                 (orientWRTHead.mV[2] < 0.0f ? 4 : 0);
 
-                        // opposite faces on Linden cubes:
+                        // opposite faces on cubes:
                         // 0 & 5
                         // 1 & 3
                         // 2 & 4
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index 8b60326..cc9fec6 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -50,7 +50,7 @@
 #include "llrender.h"
 #include "llpluginclassmedia.h"
 
-// linden library includes
+// viewer library includes
 #include "llfocusmgr.h"
 
 extern BOOL gRestoreGL;
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index fff5558..76f966e 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -233,7 +233,7 @@ LLMuteList::LLMuteList() :
 
 void LLMuteList::loadUserVolumes()
 {
-        // call once, after LLDir::setLindenUserDir() has been called
+        // call once, after LLDir::setViewerUserDir() has been called
         if (mUserVolumesLoaded)
                 return;
         mUserVolumesLoaded = TRUE;
@@ -264,8 +264,8 @@ LLMuteList::~LLMuteList()
 {
         // If we quit from the login screen we will not have an SL account
         // name.  Don't try to save, otherwise we'll dump a file in
-        // C:\Program Files\SecondLife\  JC
-        std::string user_dir = gDirUtilp->getLindenUserDir(true);
+        // the install directory.  JC
+        std::string user_dir = gDirUtilp->getViewerUserDir(true);
         if (!user_dir.empty())
         {
                 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml");
@@ -282,7 +282,7 @@ LLMuteList::~LLMuteList()
         }
 }
 
-BOOL LLMuteList::isLinden(const std::string& name) const
+BOOL LLMuteList::isGod(const std::string& name) const
 {
         typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
         boost::char_separator<char> sep(" ");
@@ -339,9 +339,9 @@ bool LLMuteList::addMuteCallback(const LLSD& notification, const LLSD& response,
 
 BOOL LLMuteList::add(const LLMute& mute, U32 flags)
 {
-        // Can't mute text from Lindens
+        // Can't mute text from gods
         if ((mute.mType == LLMute::AGENT)
-                && isLinden(mute.mName) && (flags & LLMute::flagTextChat || flags == 0))
+                && isGod(mute.mName) && (flags & LLMute::flagTextChat || flags == 0))
         {
                 LLNotifications::instance().add("MuteLinden");
                 return FALSE;
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h
index 03a548f..fd8f463 100644
--- a/linden/indra/newview/llmutelist.h
+++ b/linden/indra/newview/llmutelist.h
@@ -120,7 +120,7 @@ public:
         // Alternate (convenience) form for places we don't need to pass the name, but do need flags
         BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); };
         
-        BOOL isLinden(const std::string& name) const;
+        BOOL isGod(const std::string& name) const;
         
         BOOL isLoaded() const { return mIsLoaded; }
 
diff --git a/linden/indra/newview/llpanelLCD.cpp b/linden/indra/newview/llpanelLCD.cpp
index ba7efba..14e91d4 100644
--- a/linden/indra/newview/llpanelLCD.cpp
+++ b/linden/indra/newview/llpanelLCD.cpp
@@ -34,7 +34,7 @@
 
 #include "llpanelLCD.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llrect.h"
 #include "llfontgl.h"
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 1acfcbb..426f85e 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llpanelaudioprefs.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llrect.h"
 #include "llstring.h"
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 02befea..855bb93 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llpanelcontents.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llrect.h"
 #include "llstring.h"
diff --git a/linden/indra/newview/llpaneldebug.cpp b/linden/indra/newview/llpaneldebug.cpp
index 745daf5..503a227 100644
--- a/linden/indra/newview/llpaneldebug.cpp
+++ b/linden/indra/newview/llpaneldebug.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llpaneldebug.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llrect.h"
 #include "llstring.h"
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index 171dfbd..6abbc81 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -38,7 +38,7 @@
 
 #include "llpaneldirbrowser.h"
 
-// linden library includes
+// viewer library includes
 #include "lldir.h"
 #include "lleventflags.h"
 #include "llfontgl.h"
diff --git a/linden/indra/newview/llpaneldirclassified.cpp b/linden/indra/newview/llpaneldirclassified.cpp
index 6703ec3..bcbf2a7 100644
--- a/linden/indra/newview/llpaneldirclassified.cpp
+++ b/linden/indra/newview/llpaneldirclassified.cpp
@@ -38,7 +38,7 @@
 
 #include "llclassifiedflags.h"
 
-// linden library includes
+// viewer library includes
 #include "llfontgl.h"
 #include "message.h"
 #include "llqueryflags.h"
diff --git a/linden/indra/newview/llpaneldirevents.cpp b/linden/indra/newview/llpaneldirevents.cpp
index 34fee38..be74a95 100644
--- a/linden/indra/newview/llpaneldirevents.cpp
+++ b/linden/indra/newview/llpaneldirevents.cpp
@@ -36,7 +36,7 @@
 
 #include <sstream>
 
-// linden library includes
+// viewer library includes
 #include "llenum.h"
 #include "message.h"
 #include "llqueryflags.h"
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 719a7a0..489d527 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -34,7 +34,7 @@
 
 #include "llpaneldirfind.h"
 
-// linden library includes
+// viewer library includes
 #include "llclassifiedflags.h"
 #include "llfontgl.h"
 #include "llparcel.h"
diff --git a/linden/indra/newview/llpaneldirgroups.cpp b/linden/indra/newview/llpaneldirgroups.cpp
index 4119514..4a9947a 100644
--- a/linden/indra/newview/llpaneldirgroups.cpp
+++ b/linden/indra/newview/llpaneldirgroups.cpp
@@ -34,7 +34,7 @@
 
 #include "llpaneldirgroups.h"
 
-// linden library includes
+// viewer library includes
 #include "llagent.h"
 //#include "llfontgl.h"
 #include "message.h"
diff --git a/linden/indra/newview/llpaneldirland.cpp b/linden/indra/newview/llpaneldirland.cpp
index 3fdf37e..82f5f3e 100644
--- a/linden/indra/newview/llpaneldirland.cpp
+++ b/linden/indra/newview/llpaneldirland.cpp
@@ -34,7 +34,7 @@
 
 #include "llpaneldirland.h"
 
-// linden library includes
+// viewer library includes
 #include "llfontgl.h"
 #include "llparcel.h"
 #include "llqueryflags.h"
diff --git a/linden/indra/newview/llpaneldirpeople.cpp b/linden/indra/newview/llpaneldirpeople.cpp
index 053cad5..ae027d6 100644
--- a/linden/indra/newview/llpaneldirpeople.cpp
+++ b/linden/indra/newview/llpaneldirpeople.cpp
@@ -35,7 +35,7 @@
 #include "llpaneldirpeople.h"
 #include "llviewerwindow.h"
 
-// linden library includes
+// viewer library includes
 #include "message.h"
 
 // viewer project includes
diff --git a/linden/indra/newview/llpaneldirplaces.cpp b/linden/indra/newview/llpaneldirplaces.cpp
index ccffc02..33045ee 100644
--- a/linden/indra/newview/llpaneldirplaces.cpp
+++ b/linden/indra/newview/llpaneldirplaces.cpp
@@ -34,7 +34,7 @@
 
 #include "llpaneldirplaces.h"
 
-// linden library includes
+// viewer library includes
 #include "llfontgl.h"
 #include "message.h"
 #include "lldir.h"
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index a5c0d97..e8c67e8 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llpaneldisplay.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llfontgl.h"
 #include "llrect.h"
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc89e24..36c479a 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llpanelobject.h"
 
-// linden library includes
+// viewer library includes
 #include "lleconomy.h"
 #include "llerror.h"
 #include "llfontgl.h"
diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
index 831adc8..f35998f 100644
--- a/linden/indra/newview/llpanelskins.cpp
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -34,7 +34,7 @@
 
 #include "llpanelskins.h"
 
-// linden library includes
+// viewer library includes
 #include "llradiogroup.h"
 #include "llbutton.h"
 #include "lluictrlfactory.h"
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 6d014a2..b87a233 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -35,7 +35,7 @@
 // file include
 #include "llpanelvolume.h"
 
-// linden library includes
+// viewer library includes
 #include "llclickaction.h"
 #include "lleconomy.h"
 #include "llerror.h"
diff --git a/linden/indra/newview/llsky.cpp b/linden/indra/newview/llsky.cpp
index ac7e865..a271ec3 100644
--- a/linden/indra/newview/llsky.cpp
+++ b/linden/indra/newview/llsky.cpp
@@ -42,7 +42,7 @@
 
 #include "llsky.h"
 
-// linden library includes
+// viewer library includes
 #include "llerror.h"
 #include "llmath.h"
 #include "math.h"
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 9734a18..872750a 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -959,8 +959,8 @@ bool idle_startup()
 
                 // create necessary directories
                 // *FIX: these mkdir's should error check
-                gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
-                LLFile::mkdir(gDirUtilp->getLindenUserDir());
+                gDirUtilp->setViewerUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
+                LLFile::mkdir(gDirUtilp->getViewerUserDir());
 
                 // Set PerAccountSettingsFile to the default value.
                 gSavedSettings.setString("PerAccountSettingsFile",
@@ -2417,7 +2417,7 @@ bool idle_startup()
                         }
                 }
                 // Either we want to show tutorial because this is the first login
-                // to a Linden Help Island or the user quit with the tutorial
+                // to a grid Help Island or the user quit with the tutorial
                 // visible.  JC
                 if (show_hud
                         || gSavedSettings.getBOOL("ShowTutorial"))
@@ -3747,7 +3747,7 @@ void init_start_screen(S32 location_id)
 
         LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
 
-        std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+        std::string temp_str = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter();
 
         if ((S32)START_LOCATION_ID_LAST == location_id)
         {
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 52053f5..bd37832 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -35,7 +35,7 @@
 // self header
 #include "lltoolplacer.h"
 
-// linden library headers
+// viewer library headers
 #include "llprimitive.h"
 
 // viewer headers
diff --git a/linden/indra/newview/llurldispatcher.h b/linden/indra/newview/llurldispatcher.h
index c947e5e..ead1480 100644
--- a/linden/indra/newview/llurldispatcher.h
+++ b/linden/indra/newview/llurldispatcher.h
@@ -57,7 +57,7 @@ public:
                 //       Pointer to LLMediaCtrl sending URL, can be NULL
                 // @param trusted_browser
                 //   True if coming inside the app AND from a brower instance
-                //   that navigates to trusted (Linden Lab) pages.
+                //   that navigates to trusted pages.
                 // Returns true if someone handled the URL.
 
         static bool dispatchRightClick(const std::string& url);
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index b187f3b..fd161a2 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -48,7 +48,7 @@ bool LLURLHistory::loadFile(const std::string& filename)
 {
         LLSD data;
         {
-                std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
+                std::string temp_str = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter();
 
                 llifstream file((temp_str + filename));
 
@@ -74,7 +74,7 @@ bool LLURLHistory::loadFile(const std::string& filename)
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
 {       
-        std::string temp_str = gDirUtilp->getLindenUserDir(true);
+        std::string temp_str = gDirUtilp->getViewerUserDir(true);
         if( temp_str.empty() )
         {
                 llwarns << "Can't save " << filename 
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 59a87d5..5d9a55d 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -1345,7 +1345,7 @@ void render_disconnected_background()
                 llinfos << "Loading last bitmap..." << llendl;
 
                 std::string temp_str;
-                temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_LAST_FILENAME;
+                temp_str = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter() + SCREEN_LAST_FILENAME;
 
                 LLPointer<LLImageBMP> image_bmp = new LLImageBMP;
                 if( !image_bmp->load(temp_str) )
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index f0faedf..417f5ff 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -467,15 +467,15 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                 user_data_path += gDirUtilp->getDirDelimiter();
 
                 // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
-                // If the linden username returned is blank, that can only mean we are
+                // If the username returned is blank, that can only mean we are
                 // at the login page displaying login Web page or Web browser test via Develop menu.
                 // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
                 // is what we always used before this change)
-                std::string linden_user_dir = gDirUtilp->getLindenUserDir(true);
-                if ( ! linden_user_dir.empty() )
+                std::string viewer_user_dir = gDirUtilp->getViewerUserDir(true);
+                if ( ! viewer_user_dir.empty() )
                 {
-                        // gDirUtilp->getLindenUserDir() is whole path, not just Linden name
-                        user_data_path = linden_user_dir;
+                        // gDirUtilp->getViewerUserDir() is whole path, not just username
+                        user_data_path = viewer_user_dir;
                         user_data_path += gDirUtilp->getDirDelimiter();
                 }
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 777a871..777ea35 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -39,7 +39,7 @@
 #include <fstream>
 #include <sstream>
 
-// linden library includes
+// viewer library includes
 #include "llaudioengine.h"
 #include "llavatarnamecache.h"
 #include "indra_constants.h"
@@ -1543,7 +1543,7 @@ void init_server_menu(LLMenuGL* menu)
                 sub->append(new LLMenuItemCallGL("Owner To Me",
                                                                                  &handle_force_parcel_owner_to_me,
                                                                                  &enable_god_customer_service, NULL));
-                sub->append(new LLMenuItemCallGL("Set to Linden Content",
+                sub->append(new LLMenuItemCallGL("Set to grid Content",
                                                                                  &handle_force_parcel_to_content,
                                                                                  &enable_god_customer_service, NULL,
                                                                                  'C', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
@@ -2359,9 +2359,9 @@ class LLObjectEnableMute : public view_listener_t
                         {
                                 // It's an avatar
                                 LLNameValue *lastname = avatar->getNVPair("LastName");
-                                BOOL is_linden = lastname && !LLStringUtil::compareStrings(lastname->getString(), "Linden");
+                                BOOL is_god = lastname && !LLStringUtil::compareStrings(lastname->getString(), "Meta");
                                 BOOL is_self = avatar->isSelf();
-                                new_value = !is_linden && !is_self;
+                                new_value = !is_god && !is_self;
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                                 new_value &= (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index b88b5ca..f4c627b 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -58,7 +58,7 @@
 #include "lluploaddialog.h"
 
 
-// linden libraries
+// viewer libraries
 #include "llassetuploadresponders.h"
 #include "lleconomy.h"
 #include "llhttpclient.h"
@@ -762,7 +762,7 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                          else           
                          {              
                                  fclose(in);            
-                                 error_message = llformat("unknown linden resource file version in file: %s", src_filename.c_str());
+                                 error_message = llformat("unknown resource file version in file: %s", src_filename.c_str());
                                                                  args["FILE"] = src_filename;
                                                                  upload_error(error_message, "UnknownResourceFileVersion", filename, args);
                                  return;
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9ebfd04..657658c 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1278,7 +1278,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 
                 log_message = "You decline " + mDesc + " from " + mFromName + ".";
                 chat.mText = log_message;
-                if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) )  // muting for SL-42269
+                if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isGod(mFromName) )  // muting for SL-42269
                 {
                         chat.mMuted = TRUE;
                 }
@@ -1566,12 +1566,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
         BOOL is_busy = gAgent.getBusy();
         BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
-        BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
+        BOOL is_god = LLMuteList::getInstance()->isGod(name);
         BOOL is_owned_by_me = FALSE;
 
         LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
         
-        chat.mMuted = is_muted && !is_linden;
+        chat.mMuted = is_muted && !is_god;
         chat.mFromID = from_id;
         chat.mFromName = name;
         chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;
@@ -1877,7 +1877,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [/RLVa:KB]
 //              else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-                else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) && 
+                else if ( (offline == IM_ONLINE && !is_god && is_busy && name != SYSTEM_FROM) && 
                               ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
 // [/RLVa:KB]
                 {
@@ -1937,9 +1937,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 else if (to_id.isNull())
                 {
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                        // Filter region messages that weren't sent by a Linden
+                        // Filter region messages that weren't sent by a god
                         if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) && 
-                                (!LLMuteList::getInstance()->isLinden(name)) && (from_id != gAgent.getID()) )
+                                (!LLMuteList::getInstance()->isGod(name)) && (from_id != gAgent.getID()) )
                         {
                                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                                         gRlvHandler.filterLocation(message);
@@ -1984,7 +1984,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
                         LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
-                        if (!is_muted || is_linden)
+                        if (!is_muted || is_god)
                         {
                                 gIMMgr->addMessage(
                                         session_id,
@@ -2297,7 +2297,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         
         case IM_SESSION_SEND:
         {
-                if (!is_linden && is_busy)
+                if (!is_god && is_busy)
                 {
                         return;
                 }
@@ -2929,7 +2929,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 LLMute::flagTextChat) 
                 || LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
         is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
-                LLMuteList::getInstance()->isLinden(from_name);
+                LLMuteList::getInstance()->isGod(from_name);
 
         BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
         chatter = gObjectList.findObject(from_id);
@@ -3286,7 +3286,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 }
 
                 // truth table:
-                // LINDEN       BUSY    MUTED   OWNED_BY_YOU    TASK            DISPLAY         STORE IN HISTORY
+                // GOD          BUSY    MUTED   OWNED_BY_YOU    TASK            DISPLAY         STORE IN HISTORY
                 // F            F               F               F                               *                       Yes                     Yes
                 // F            F               F               T                               *                       Yes                     Yes
                 // F            F               T               F                               *                       No                      No
@@ -5272,7 +5272,7 @@ void process_alert_core(const std::string& message, BOOL modal)
         else if( message == "Home position set." )
         {
                 // save the home location image to disk
-                std::string snap_filename = gDirUtilp->getLindenUserDir();
+                std::string snap_filename = gDirUtilp->getViewerUserDir();
                 snap_filename += gDirUtilp->getDirDelimiter();
                 snap_filename += SCREEN_HOME_FILENAME;
                 gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
@@ -6627,7 +6627,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
                 }
                 else
                 {
-                        covenant_text = "There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.";
+                        covenant_text = "There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not the grid owners.  Please contact the Estate Owner for sales details.";
                 }
                 LLPanelEstateCovenant::updateCovenantText(covenant_text, covenant_id);
                 LLPanelLandCovenant::updateCovenantText(covenant_text);
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 6a33aba..f721550 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -53,7 +53,7 @@
 // TODO: Many of these includes are unnecessary.  Remove them.
 //
 
-// linden library includes
+// viewer library includes
 #include "llaudioengine.h"              // mute on minimize
 #include "indra_constants.h"
 #include "llassetstorage.h"
@@ -1706,7 +1706,7 @@ void LLViewerWindow::initWorldUI()
         }
 }
 
-// initWorldUI that wasn't before logging in. Some of this may require the access the 'LindenUserDir'.
+// initWorldUI that wasn't before logging in. Some of this may require the access the 'ViewerUserDir'.
 void LLViewerWindow::initWorldUI_postLogin()
 {
         S32 height = mRootView->getRect().getHeight();
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 7b1ed95..3800b4d 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -4668,11 +4668,11 @@ void LLVoiceClient::messageEvent(
                 {
                         bool is_busy = gAgent.getBusy();
                         bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
-                        bool is_linden = LLMuteList::getInstance()->isLinden(session->mName);
+                        bool is_god = LLMuteList::getInstance()->isGod(session->mName);
                         bool quiet_chat = false;
                         LLChat chat;
 
-                        chat.mMuted = is_muted && !is_linden;
+                        chat.mMuted = is_muted && !is_god;
                         
                         if(!chat.mMuted)
                         {
@@ -4680,7 +4680,7 @@ void LLVoiceClient::messageEvent(
                                 chat.mFromName = session->mName;
                                 chat.mSourceType = CHAT_SOURCE_AGENT;
 
-                                if(is_busy && !is_linden)
+                                if(is_busy && !is_god)
                                 {
                                         quiet_chat = true;
                                         // TODO: Question: Return busy mode response here?  Or maybe when session is started instead?
diff --git a/linden/indra/newview/llvowlsky.cpp b/linden/indra/newview/llvowlsky.cpp
index 96bd62e..572a2a1 100644
--- a/linden/indra/newview/llvowlsky.cpp
+++ b/linden/indra/newview/llvowlsky.cpp
@@ -139,7 +139,7 @@ inline F32 LLVOWLSky::calcPhi(U32 i)
 #if !DOME_SLICES
 static const F32 Q = (1.f + sqrtf(5.f))/2.f; //golden ratio
 
-//icosahedron verts (based on asset b0c7b76e-28c6-1f87-a1de-752d5e3cd264, contact Runitai Linden for a copy)
+//icosahedron verts (based on asset b0c7b76e-28c6-1f87-a1de-752d5e3cd264 in the second life grid, contact Runitai Linden for a copy)
 static const LLVector3 icosahedron_vert[] =
 {
         LLVector3(0,1.f,Q),
diff --git a/linden/indra/newview/llwind.cpp b/linden/indra/newview/llwind.cpp
index ae98bea..bdd31dc 100644
--- a/linden/indra/newview/llwind.cpp
+++ b/linden/indra/newview/llwind.cpp
@@ -41,7 +41,7 @@
 
 #include "llwind.h"
 
-// linden libraries
+// viewer libraries
 #include "llgl.h"
 #include "patch_dct.h"
 #include "patch_code.h"
diff --git a/linden/indra/newview/macview_Prefix.h b/linden/indra/newview/macview_Prefix.h
index 8cbabb5..5a895b2 100644
--- a/linden/indra/newview/macview_Prefix.h
+++ b/linden/indra/newview/macview_Prefix.h
@@ -30,7 +30,7 @@
  * $/LicenseInfo$
  */
 
-// MBW -- This doesn't work.  There are some conflicts between things in Carbon.h and some of the linden source.
+// MBW -- This doesn't work.  There are some conflicts between things in Carbon.h and some of the viewer source.
 //#include <Carbon/Carbon.h>
 
 ////////////////// From llagent.cpp
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 305731f..f7f1345 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -7,7 +7,7 @@
 #include <fstream>
 #include <sstream>
 
-// linden library includes
+// viewer library includes
 #include "llfilepicker.h"
 #include "indra_constants.h"
 #include "llsdserialize.h"
diff --git a/linden/indra/newview/skins/dark/colors_base.xml b/linden/indra/newview/skins/dark/colors_base.xml
index 19a3b72..cbf1075 100644
--- a/linden/indra/newview/skins/dark/colors_base.xml
+++ b/linden/indra/newview/skins/dark/colors_base.xml
@@ -171,7 +171,7 @@
 <ParcelTextColor value="0, 200, 100, 200" />                    <!-- Parcel name on menu bar, normal state -->

 <ParcelHoverColor value="0, 200, 100, 255" />                   <!-- Parcel name on menu bar, hover state -->

 <TimeTextColor value="255, 255, 255, 255" />                    <!-- SL Time on menu bar -->

-<BalanceTextColor value="0, 255, 0, 255"/>                              <!-- Linden dollar balance on menu bar -->

+<BalanceTextColor value="0, 255, 0, 255"/>                              <!-- Currency balance on menu bar -->

 <HealthTextColor value="255, 255, 255, 255"/>                   <!-- Damage meter text on menu bar -->

 <GroupOverTierColor value="110, 15, 15, 255" />                 <!-- Warning text in Group Info window -->

 <FilterBackgroundColor value="0, 0, 20, 255"/>                  <!-- Matching region of Inventory search text -->

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index b90f8aa..d1f202b 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -105,7 +105,7 @@
 <ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
 <ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->
 <TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 255, 0, 255" />             <!-- Linden dollar balance on menu bar -->
+<BalanceTextColor value="0, 255, 0, 255" />             <!-- Currency balance on menu bar -->
 <HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->
  
 <!-- TOOLTIPS -->
diff --git a/linden/indra/newview/skins/default/xui/da/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/da/floater_report_bug.xml
index c070c07..0fad222 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_report_bug.xml
@@ -60,8 +60,8 @@
                 <combo_item name="MissingContent">
                         Mangler Indhold
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden Dollars (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Rettigheder
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
index fdcde20..863c3e9 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
@@ -61,8 +61,8 @@ dann auf das Objekt:
                 <combo_item name="MissingContent">
                         Fehlender Inhalt
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden Dollar (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Berechtigungen
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index c8aacba..5836901 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -1450,14 +1450,14 @@ Select the thumbnail to choose a different texture.
                         </text>
                         <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
                              height="16" initial_value="false"
-                             label="Residents who have not given payment info to Linden Lab"
+                             label="Residents who have not given payment info"
                              left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false"
                              tool_tip="Ban unidentified residents." width="278" />
                         <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
                              height="16" initial_value="false"
                              label="Residents who are not age verified adults" left_delta="0"
                              mouse_opaque="true" name="limit_age_verified" radio_style="false"
-                             tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
+                             tool_tip="Ban residents who have not verified their age."
                              width="278" />
                         <string name="estate_override">
                                 One or more of these options is set at the estate level
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 83d7a5c..67b72e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
@@ -106,8 +106,8 @@
                 <combo_item name="MissingContent" value="21">
                         Missing Content
                 </combo_item>
-                <combo_item name="LindenDollars(L$)" value="14">
-                        Linden Dollars (L$)
+                <combo_item name="GridCurrency" value="14">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions" value="15">
                         Permissions
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 358dbbf..668cf4e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1442,7 +1442,7 @@ Corrupt resource file:
  icon="alertmodal.tga"
  name="UnknownResourceFileVersion"
  type="alertmodal">
-Unknown Linden resource file version in file: 
+Unknown resource file version in file: 
 
 [FILE]
 </notification>
@@ -2877,7 +2877,7 @@ Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
  icon="alertmodal.tga"
  name="WebLaunchSupportWiki"
  type="alertmodal">
-Go to the Official Linden Blog, for the latest news and information.
+Go to the grids web site, for the latest news and information.
   <usetemplate
    ignoretext="When launching web browser to view the blog"
    name="okcancelignore"
@@ -4030,7 +4030,7 @@ Estate managers can only be added or removed by the owner of the estate, not by
  label="Use Global Time"
  name="HelpEstateUseGlobalTime"
  type="alertmodal">
-This checkbox makes the sun in your estate follow the same position as on the Linden-owned &apos;mainland&apos; estates.
+This checkbox makes the sun in your estate follow the same position as on the grid owned estates.
 
 Default: on
 </notification>
@@ -4086,7 +4086,7 @@ Access to this estate will be limited to groups listed here and any Residents ab
  type="alertmodal">
 Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
 
-Setting it blank will cause abuse reports to be sent only to Linden Lab.
+Setting it blank will cause abuse reports to be sent only to the grid owners.
 </notification>
 
 <notification
@@ -4418,14 +4418,14 @@ http://secondlife.com/support/incidentreport.php
  icon="alertmodal.tga"
  name="HelpReportAbuseEmailEO"
  type="alertmodal">
-IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab.
+IMPORTANT: This report will go to the owner of the region you are currently in and not to the grid owners.
 
-As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. Linden Lab will not investigate reports you file from this location.
+As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. The grid owners will not investigate reports you file from this location.
 
 The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
 (View covenants by going to the World menu and selecting About Land.)
 
-The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report. <!-- Only Linden Lab can restrict access to the entirety of [GRID_NAME]. -->
+The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report. <!-- Only the grid owners can restrict access to the entirety of [GRID_NAME]. -->
 </notification>
 
 <notification
@@ -4519,15 +4519,13 @@ Dear Resident,
 
 You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
 
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world.
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behaviour that violates this grids Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from this grid.
 
-(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
+(2) The DMCA or Content Removal Process. To request removal of content from this grid, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
 
 If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;.
 
-Thank you,
-
-Linden Lab
+Thank you.
 </notification>
 
 <notification
diff --git a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index bac41bc..1c59430 100644
--- a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -84,7 +84,7 @@
                      longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
                      name="land change media" value="20" />
                 <action description="Toggle &apos;Edit Terrain&apos;"
-                     longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
+                     longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move prim plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
                      name="land edit" value="21" />
                 <action description="Toggle various About Land &gt; Options settings"
                      longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
@@ -126,7 +126,7 @@
                      name="land admin" value="32" />
         </action_set>
         <action_set
-             description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects."
+             description="These Abilities include powers to allow members to return objects and place and move prim plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects."
              name="Parcel Content">
                 <action description="Return objects owned by group"
                      longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
@@ -137,8 +137,8 @@
                 <action description="Return non-group objects"
                      longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
                      name="land return non group" value="34" />
-                <action description="Landscaping using Linden plants"
-                     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
+                <action description="Landscaping using prim plants"
+                     longdescription="Landscaping ability to place and move prim trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
                      name="land gardening" value="35" />
         </action_set>
         <action_set
diff --git a/linden/indra/newview/skins/default/xui/es/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/es/floater_report_bug.xml
index 3d32829..da6944e 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_report_bug.xml
@@ -57,8 +57,8 @@
                 <combo_item name="MissingContent">
                         Contenido perdido
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden Dólares (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Permisos
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
index 80a42f1..1cbf457 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
@@ -61,8 +61,8 @@
                 <combo_item name="MissingContent">
                         Contenu manquant
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Dollar Linden (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Autorisations
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml
index 6c3286d..3db9f5a 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_report_bug.xml
@@ -60,8 +60,8 @@
                 <combo_item name="MissingContent">
                         Hiányzó tartalom
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden dollár (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Jogosultság
diff --git a/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml
index efaa626..07cd21e 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_report_bug.xml
@@ -57,8 +57,8 @@
                 <combo_item name="MissingContent">
                         Contenuto mancante
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden Dollar (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Permessi
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
index 7c20151..dbcb21d 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
@@ -63,7 +63,7 @@
                 <combo_item name="MissingContent">
                         コンテンツなし
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
+                <combo_item name="GridCurrency">
                         リンデン・ドル(L$)
                 </combo_item>
                 <combo_item name="Permissions">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
index fbe3a45..a7b1ab5 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
@@ -64,7 +64,7 @@
                 <combo_item name="MissingContent">
                         유실 컨텐츠
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
+                <combo_item name="GridCurrency">
                         린든달러(L$)
                 </combo_item>
                 <combo_item name="Permissions">
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml
index af4c4c5..15c9547 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_report_bug.xml
@@ -60,8 +60,8 @@
                 <combo_item name="MissingContent">
                         Brakujący Element
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden Dollars (L$)
+                <combo_item name="GridCurrency">
+                        Grid currency
                 </combo_item>
                 <combo_item name="Permissions">
                         Prawa
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml
index 0779ac3..b74c154 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_report_bug.xml
@@ -60,7 +60,7 @@
                 <combo_item name="MissingContent">
                         Отсутствующее содержимое
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
+                <combo_item name="GridCurrency">
                         Деньги (L$)
                 </combo_item>
                 <combo_item name="Permissions">
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml
index f23a2bc..12de17b 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_report_bug.xml
@@ -60,7 +60,7 @@
                 <combo_item name="MissingContent">
                         Відсутній зміст
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
+                <combo_item name="GridCurrency">
                         Гроші (L$)
                 </combo_item>
                 <combo_item name="Permissions">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
index 0a5d292..24e2e15 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
@@ -57,7 +57,7 @@
                 <combo_item name="MissingContent">
                         遗失内容
                 </combo_item>
-                <combo_item name="LindenDollars(L$)">
+                <combo_item name="GridCurrency">
                         林登币 (L$)
                 </combo_item>
                 <combo_item name="Permissions">
diff --git a/linden/indra/newview/skins/gemini/colors_base.xml b/linden/indra/newview/skins/gemini/colors_base.xml
index 935c6d3..0b65586 100644
--- a/linden/indra/newview/skins/gemini/colors_base.xml
+++ b/linden/indra/newview/skins/gemini/colors_base.xml
@@ -173,7 +173,7 @@
 <ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->

 <ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->

 <TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->

-<BalanceTextColor value="255, 255, 255, 255" />         <!-- Linden dollar balance on menu bar -->

+<BalanceTextColor value="255, 255, 255, 255" />         <!-- Currency balance on menu bar -->

 <HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->

 <GroupOverTierColor value="255, 255, 255, 255" />               <!-- Warning text in Group Info window -->

 <FilterBackgroundColor value="0, 0, 0, 255" />         <!-- Matching region of Inventory search text -->

diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index f9bf283..e2059c6 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -105,7 +105,7 @@
 <ParcelTextColor value="40, 40, 90, 255" />               <!-- Parcel name on menu bar, normal state -->
 <ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
 <TimeTextColor value="0, 30, 60, 255" />                    <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
+<BalanceTextColor value="0, 100, 40, 255" />            <!-- Currency balance on menu bar -->
 <HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
  
 <!-- TOOLTIPS -->
diff --git a/linden/indra/newview/skins/white_Meta7/colors_base.xml b/linden/indra/newview/skins/white_Meta7/colors_base.xml
index 514782e..78b7b27 100644
--- a/linden/indra/newview/skins/white_Meta7/colors_base.xml
+++ b/linden/indra/newview/skins/white_Meta7/colors_base.xml
@@ -172,7 +172,7 @@
 <ParcelTextColor value="0, 0, 0, 255" />                <!-- Parcel name on menu bar, normal state -->
 <ParcelHoverColor value="51, 153, 0, 255" />            <!-- Parcel name on menu bar, hover state -->
 <TimeTextColor value="0, 0, 0, 255" />          <!-- SL Time on menu bar -->
-<BalanceTextColor value="51, 153, 0, 255" />            <!-- Linden dollar balance on menu bar -->
+<BalanceTextColor value="51, 153, 0, 255" />            <!-- Currency balance on menu bar -->
 <HealthTextColor value="0, 0, 0, 255" />                <!-- Damage meter text on menu bar -->
 <GroupOverTierColor value="0, 0, 0, 255" />             <!-- Warning text in Group Info window -->
 <FilterBackgroundColor value="153, 153, 153, 255" /> <!-- Matching region of Inventory search text -->
diff --git a/linden/indra/win_crash_logger/win_crash_logger.rc b/linden/indra/win_crash_logger/win_crash_logger.rc
index 2819722..bbefab6 100644
--- a/linden/indra/win_crash_logger/win_crash_logger.rc
+++ b/linden/indra/win_crash_logger/win_crash_logger.rc
@@ -96,7 +96,7 @@ BEGIN
     LTEXT           "logs, all of which are used for debugging purposes only.",IDC_STATIC,4,33,210,8
     LTEXT           "In the space below, please briefly describe what you were doing",IDC_STATIC,3,48,208,8
     LTEXT           "or trying to do just prior to the crash.",IDC_STATIC,3,56,204,8
-    LTEXT           "If you don't wish to send Linden Lab a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
+    LTEXT           "If you don't wish to send the grid developers a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
     LTEXT           "This report is NOT read by customer support.  If you have billing or",IDC_STATIC,3,68,208,8
     LTEXT           "other questions, please go to: www.secondlife.com/support",IDC_STATIC,3,76,206,8
     CONTROL         "Remember this choice",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,193,89,13