56 files changed, 292 insertions, 218 deletions

diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index ca392f1..2f68a02 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.13.2.12";
-CFBundleGetInfoString = "Second Life version 1.13.2.12, Copyright 2004-2006 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.13.2.15";
+CFBundleGetInfoString = "Second Life version 1.13.2.15, Copyright 2004-2006 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 8e8771d..3e6c65e 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.13.2.12</string>
+        <string>1.13.2.15</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/linux_tools/exposed-symbols.txt b/linden/indra/newview/linux_tools/exposed-symbols.txt
new file mode 100644
index 0000000..98df90a
--- /dev/null
+++ b/linden/indra/newview/linux_tools/exposed-symbols.txt
@@ -0,0 +1,3 @@
+initllpython
+createLLImageJ2CKDU
+destroyLLImageJ2CKDU
diff --git a/linden/indra/newview/linux_tools/hidesymbols.ver b/linden/indra/newview/linux_tools/hidesymbols.ver
deleted file mode 100644
index 6ce7719..0000000
--- a/linden/indra/newview/linux_tools/hidesymbols.ver
+++ /dev/null
@@ -1,9 +0,0 @@
-LL_PRIVATE {
-        global:
-                initllpython;
-                createLLImageJ2CKDU;
-                destroyLLImageJ2CKDU;
-        local:
-                *;
-};
-
diff --git a/linden/indra/newview/linux_tools/package-client.sh b/linden/indra/newview/linux_tools/package-client.sh
index 1446e78..b054386 100755
--- a/linden/indra/newview/linux_tools/package-client.sh
+++ b/linden/indra/newview/linux_tools/package-client.sh
@@ -106,8 +106,15 @@ then
     echo 'Default grid - creating empty gridargs.dat'
     echo " " > $PACKAGE_NAME/gridargs.dat
 else
-    echo "Creating gridargs.dat for package, grid $GRID"
-    echo "--${GRID} -helperuri http://preview-${GRID}.secondlife.com/helpers/" > $PACKAGE_NAME/gridargs.dat
+    if [ X$GRID == X'firstlook' ]
+    then
+        # firstlook is a special case... it's not really a grid.
+        echo "Creating gridargs.dat for firstlook"
+        echo "-settings settings_firstlook.xml" > $PACKAGE_NAME/gridargs.dat
+    else
+        echo "Creating gridargs.dat for package, grid $GRID"
+        echo "-settings settings_beta.xml --${GRID} -helperuri http://preview-${GRID}.secondlife.com/helpers/" > $PACKAGE_NAME/gridargs.dat
+    fi
 fi
 
 TARBALL=$PACKAGE_NAME.tar.bz2
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 26ef1b0..6d9137d 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -2115,11 +2115,11 @@ void LLAgent::updateWanderTarget()
         F32 rand_x;
         F32 rand_y;
 
-        if (mWanderTimer.checkExpirationAndReset(frand(MAX_WANDER_TIME)))
+        if (mWanderTimer.checkExpirationAndReset(ll_frand(MAX_WANDER_TIME)))
         {
                 // Pick a random spot to wander towards
                 num_regions = gWorldPointer->mActiveRegionList.getLength();
-                S32 region_num = llround(frand(1.f) * num_regions);
+                S32 region_num = llround(ll_frand() * num_regions);
                 rand_region = gWorldPointer->mActiveRegionList.getFirstData();
                 S32 i = 0;
                 while (i < region_num)
@@ -2127,8 +2127,8 @@ void LLAgent::updateWanderTarget()
                         rand_region = gWorldPointer->mActiveRegionList.getNextData();
                         i++;
                 }
-                rand_x = frand(rand_region->getWidth());
-                rand_y = frand(rand_region->getWidth());
+                rand_x = ll_frand(rand_region->getWidth());
+                rand_y = ll_frand(rand_region->getWidth());
                 
                 stopAutoPilot();
                 startAutoPilotGlobal(rand_region->getPosGlobalFromRegion(LLVector3(rand_x, rand_y, 0.f)));
@@ -5687,7 +5687,7 @@ void LLAgent::fidget()
                         // pick a random fidget anim here
                         S32 oldFidget = mCurrentFidget;
 
-                        mCurrentFidget = gLindenLabRandomNumber.llrand(NUM_AGENT_STAND_ANIMS);
+                        mCurrentFidget = ll_rand(NUM_AGENT_STAND_ANIMS);
 
                         if (mCurrentFidget != oldFidget)
                         {
@@ -5719,7 +5719,7 @@ void LLAgent::fidget()
                         }
 
                         // calculate next fidget time
-                        mNextFidgetTime = curTime + gLindenLabRandomNumber.llfrand(MAX_FIDGET_TIME - MIN_FIDGET_TIME) + MIN_FIDGET_TIME;
+                        mNextFidgetTime = curTime + ll_frand(MAX_FIDGET_TIME - MIN_FIDGET_TIME) + MIN_FIDGET_TIME;
                 }
         }
 }
diff --git a/linden/indra/newview/llanimalcontrols.cpp b/linden/indra/newview/llanimalcontrols.cpp
index 8bafe86..2e047ae 100644
--- a/linden/indra/newview/llanimalcontrols.cpp
+++ b/linden/indra/newview/llanimalcontrols.cpp
@@ -103,7 +103,7 @@ void LLAnimalControlsVirtualServer::update()
 
                 F32 leftRightSpan = 5.0f;
 
-                F32 randomSpan = gLindenLabRandomNumber.llfrand( leftRightSpan );
+                F32 randomSpan = ll_frand( leftRightSpan );
 
                 focusPosition += leftDirection * ( - leftRightSpan * ONE_HALF + randomSpan );
         }
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index e1b2281..ca05562 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -193,9 +193,9 @@ void LLCloudGroup::updatePuffCount()
                 for (i = current_puff_count; i < target_puff_count; i++)
                 {
                         puff_pos_global = mVOCloudsp->getPositionGlobal();
-                        F32 x = frand(256.f/CLOUD_GROUPS_PER_EDGE) - 128.f/CLOUD_GROUPS_PER_EDGE;
-                        F32 y = frand(256.f/CLOUD_GROUPS_PER_EDGE) - 128.f/CLOUD_GROUPS_PER_EDGE;
-                        F32 z = frand(CLOUD_HEIGHT_RANGE) - 0.5f*CLOUD_HEIGHT_RANGE;
+                        F32 x = ll_frand(256.f/CLOUD_GROUPS_PER_EDGE) - 128.f/CLOUD_GROUPS_PER_EDGE;
+                        F32 y = ll_frand(256.f/CLOUD_GROUPS_PER_EDGE) - 128.f/CLOUD_GROUPS_PER_EDGE;
+                        F32 z = ll_frand(CLOUD_HEIGHT_RANGE) - 0.5f*CLOUD_HEIGHT_RANGE;
                         puff_pos_global += LLVector3d(x, y, z);
                         mCloudPuffs[i].mPositionGlobal = puff_pos_global;
                         mCloudPuffs[i].mAlpha = 0.01f;
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index c186f6a..850b5bf 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -106,6 +106,7 @@ void declare_settings()
         gSavedSettings.declareS32("MenuBarWidth", 410, "", NO_PERSIST );
 
         gSavedSettings.declareF32("MenuAccessKeyTime", 0.25f, "Time (seconds) in which the menu key must be tapped to move focus to the menu bar");
+        gSavedSettings.declareBOOL("UseAltKeyForMenus", FALSE, "Access menus via keyboard by tapping Alt");
         // Which background overlay to use
         gSavedSettings.declareS32("MapOverlayIndex", 0, "Currently selected world map type");
 
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 28e60f1..befcc70 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -113,9 +113,10 @@ void LLStandardBumpmap::restoreGL()
 
         while( !feof(file) && (LLStandardBumpmap::sStandardBumpmapCount < (U32)TEM_BUMPMAP_COUNT) )
         {
+                // *NOTE: This buffer size is hard coded into scanf() below.
                 char label[2048] = "";
                 char bump_file[2048] = "";
-                fields_read = fscanf( file, "\n%s %s", label, bump_file);
+                fields_read = fscanf( file, "\n%2047s %2047s", label, bump_file);
                 if( EOF == fields_read )
                 {
                         break;
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index 3fddc4b..e147e3f 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -71,19 +71,21 @@ static LLColor4 green9(0.6f, 1.0f, 0.6f, 1.0f);
 // red (5) magenta (4)
 static struct ft_display_info ft_display_table[] =
 {
-        { LLFastTimer::FTM_FRAME,                               "Frame",                        &LLColor4::white, 0 },
-        { LLFastTimer::FTM_MESSAGES,                    " Messages",            &LLColor4::grey1, 0 },
-        { LLFastTimer::FTM_SLEEP,                               " Sleep",                       &LLColor4::grey2, 0 },
-        { LLFastTimer::FTM_IDLE,                                " Idle",                        &blue0, 0 },
-        { LLFastTimer::FTM_INVENTORY,                   "  Inventory Update",                   &LLColor4::purple6, 1 },
-        { LLFastTimer::FTM_AUTO_SELECT,                 "   Open and Select",           &LLColor4::red, 0 },
+        { LLFastTimer::FTM_FRAME,                               "Frame",                                &LLColor4::white, 0 },
+        { LLFastTimer::FTM_MESSAGES,                    " Messages",                    &LLColor4::grey1, 0 },
+        { LLFastTimer::FTM_SLEEP,                               " Sleep",                               &LLColor4::grey2, 0 },
+        { LLFastTimer::FTM_IDLE,                                " Idle",                                &blue0, 0 },
+        { LLFastTimer::FTM_PUMP,                                "  Pump",                               &LLColor4::magenta2, 1 },
+        { LLFastTimer::FTM_CURL,                                "   Curl",                              &LLColor4::magenta3, 0 },
+        { LLFastTimer::FTM_INVENTORY,                   "  Inventory Update",   &LLColor4::purple6, 1 },
+        { LLFastTimer::FTM_AUTO_SELECT,                 "   Open and Select",   &LLColor4::red, 0 },
         { LLFastTimer::FTM_FILTER,                              "   Filter",                    &LLColor4::red2, 0 },
         { LLFastTimer::FTM_ARRANGE,                             "   Arrange",                   &LLColor4::red3, 0 },
         { LLFastTimer::FTM_REFRESH,                             "   Refresh",                   &LLColor4::red4, 0 },
         { LLFastTimer::FTM_SORT,                                "   Sort",                              &LLColor4::red5, 0 },
-        { LLFastTimer::FTM_RESET_DRAWORDER,             "  ResetDrawOrder",     &LLColor4::pink1, 0 },
-        { LLFastTimer::FTM_WORLD_UPDATE,                "  World Update",       &LLColor4::blue1, 1 },
-        { LLFastTimer::FTM_UPDATE_MOVE,                 "   Move Objects",      &LLColor4::pink2, 0 },
+        { LLFastTimer::FTM_RESET_DRAWORDER,             "  ResetDrawOrder",             &LLColor4::pink1, 0 },
+        { LLFastTimer::FTM_WORLD_UPDATE,                "  World Update",               &LLColor4::blue1, 1 },
+        { LLFastTimer::FTM_UPDATE_MOVE,                 "   Move Objects",              &LLColor4::pink2, 0 },
         { LLFastTimer::FTM_OCTREE_BALANCE,              "    Octree Balance",   &LLColor4::red3, 0 },
         { LLFastTimer::FTM_CULL,                                "   Object Cull",       &LLColor4::blue2, 0 },
         { LLFastTimer::FTM_CULL_REBOUND,                "    Rebound",          &LLColor4::blue3, 0 },
@@ -281,6 +283,13 @@ BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask)
                         }
                 }
         }
+        else if (mask & MASK_ALT)
+        {
+                if (mask & MASK_SHIFT)
+                        mSubtractHidden = !mSubtractHidden;
+                else
+                        mDisplayCalls = !mDisplayCalls;
+        }
         else if (mask & MASK_SHIFT)
         {
                 if (++mDisplayMode > 3)
@@ -301,8 +310,8 @@ BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask)
                         mScrollIndex = 0;
                 }
         }
-        // RN: for now, pass all mouse events through
-        return FALSE;
+        // SJB: Don't pass mouse clicks through the display
+        return TRUE;
 }
 
 BOOL LLFastTimerView::handleMouseUp(S32 x, S32 y, MASK mask)
@@ -359,33 +368,6 @@ BOOL LLFastTimerView::handleScrollWheel(S32 x, S32 y, S32 clicks)
         return FALSE;
 }
 
-BOOL LLFastTimerView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
-{
-        // Otherwise space key gets eaten from the rest of the UI. JC
-        if (getVisible())
-        {
-                switch (key)
-                {
-                  case '=':
-                        mDisplayCalls = !mDisplayCalls;
-                        return TRUE;
-                  case '-':
-                        mSubtractHidden = !mSubtractHidden;
-                        return TRUE;
-                  case ' ':
-                        // pause/unpause
-                        LLFastTimer::sPauseHistory = !LLFastTimer::sPauseHistory;
-                        // reset scroll to bottom when unpausing
-                        if (!LLFastTimer::sPauseHistory)
-                        {
-                                mScrollIndex = 0;
-                        }
-                        return TRUE;
-                }
-        }
-        return FALSE;
-}
-
 void LLFastTimerView::draw()
 {
         LLFastTimer t(LLFastTimer::FTM_RENDER_TIMER);
@@ -480,7 +462,7 @@ void LLFastTimerView::draw()
                 LLFontGL::sMonospace->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP);
                 y -= (texth + 2);
 
-                LLFontGL::sMonospace->renderUTF8("[Right-click to log selected] [= to toggle counts] [- to subtract hidden]",
+                LLFontGL::sMonospace->renderUTF8("[Right-Click log selected] [ALT-Click toggle counts] [ALT-SHIFT-Click sub hidden]",
                                                                                  0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP);
                 y -= (texth + 2);
         }
@@ -566,7 +548,7 @@ void LLFastTimerView::draw()
                 }
                 else
                 {
-                        U64 ticks = disabled >= 1 ? ticks_sum[0][i] : LLFastTimer::sCountAverage[tidx];
+                        U64 ticks = ticks_sum[0][i];
                         ms = (F32)((F64)ticks * iclock_freq);
                         calls = (S32)LLFastTimer::sCallAverage[tidx];
                 }
diff --git a/linden/indra/newview/llfasttimerview.h b/linden/indra/newview/llfasttimerview.h
index eb160e8..b20c8eb 100644
--- a/linden/indra/newview/llfasttimerview.h
+++ b/linden/indra/newview/llfasttimerview.h
@@ -45,7 +45,6 @@ public:
         virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
-        virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
         virtual void draw();
 
         S32 getLegendIndex(S32 y);
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index d3b0dbb..061b343 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -300,12 +300,7 @@ BOOL LLFeatureManager::loadFeatureTables()
         return TRUE;
 }
 
-S32 LLFeatureManager::getGPUClass()
-{
-        return mGPUClass;
-}
-
-S32 LLFeatureManager::loadGPUClass()
+void LLFeatureManager::loadGPUClass()
 {
         std::string data_path = gDirUtilp->getAppRODataDir();
 
@@ -313,6 +308,10 @@ S32 LLFeatureManager::loadGPUClass()
 
         data_path += GPU_TABLE_FILENAME;
 
+        // defaults
+        mGPUClass = 0;
+        mGPUString = gGLManager.getRawGLString();
+        
         llifstream file;
                 
         file.open(data_path.c_str()); 
@@ -320,7 +319,7 @@ S32 LLFeatureManager::loadGPUClass()
         if (!file)
         {
                 llwarns << "Unable to open GPU table: " << data_path << "!" << llendl;
-                return 0;
+                return;
         }
 
         std::string renderer = gGLManager.getRawGLString();
@@ -379,14 +378,14 @@ S32 LLFeatureManager::loadGPUClass()
                 {
                         file.close();
                         llinfos << "GPU is " << label << llendl;
-                        return (S32) strtol(cls, NULL, 10);     
+                        mGPUString = label;
+                        mGPUClass = (S32) strtol(cls, NULL, 10);        
                 }
         }
         file.close();
         //flp->dump();
 
         llwarns << "Couldn't match GPU to a class: " << gGLManager.getRawGLString() << llendl;
-        return 0;
 }
 
 void LLFeatureManager::cleanupFeatureTables()
@@ -419,7 +418,7 @@ void LLFeatureManager::initCPUFeatureMasks()
 
 void LLFeatureManager::initGraphicsFeatureMasks()
 {
-        mGPUClass = loadGPUClass();
+        loadGPUClass();
         
         if (mGPUClass >= 0 && mGPUClass < 4)
         {
diff --git a/linden/indra/newview/llfeaturemanager.h b/linden/indra/newview/llfeaturemanager.h
index d38e5b7..a24f06f 100644
--- a/linden/indra/newview/llfeaturemanager.h
+++ b/linden/indra/newview/llfeaturemanager.h
@@ -84,9 +84,10 @@ public:
         void maskCurrentList(const char *name); // Mask the current feature list with the named list
 
         BOOL loadFeatureTables();
-        S32     getGPUClass();
-        S32     loadGPUClass();
 
+        S32     getGPUClass()                                   { return mGPUClass; }
+        std::string& getGPUString()             { return mGPUString; }
+        
         void cleanupFeatureTables();
 
         S32 getVersion() const                          { return mTableVersion; }
@@ -102,7 +103,9 @@ public:
         BOOL initPCIFeatureMasks();
 
         void applyRecommendedFeatures();
+
 protected:
+        void loadGPUClass();
         void initBaseMask();
 
         std::map<LLString, LLFeatureList *> mMaskList;
@@ -110,6 +113,7 @@ protected:
         S32                     mTableVersion;
         BOOL            mSafe;                                  // Reinitialize everything to the "safe" mask
         S32                     mGPUClass;
+        std::string     mGPUString;
 };
 
 extern LLFeatureManager *gFeatureManagerp;
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 7e748f6..7e37c4c 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -204,9 +204,13 @@ void LLVolumeImplFlexible::setAttributesOfAllSections()
                 end_rot = F_PI * params.getTwist();
         }
 
+        if (!mVO->mDrawable)
+        {
+                return;
+        }
+        
         S32 num_sections = 1 << mSimulateRes;
 
-
         LLVector3 scale = mVO->mDrawable->getScale();
                                                                         
         mSection[0].mPosition = getAnchorPosition();
diff --git a/linden/indra/newview/llfloatereditui.cpp b/linden/indra/newview/llfloatereditui.cpp
index d6a61d7..21580d3 100644
--- a/linden/indra/newview/llfloatereditui.cpp
+++ b/linden/indra/newview/llfloatereditui.cpp
@@ -53,7 +53,7 @@ void	LLFloaterEditUI::navigateHierarchyButtonPressed(void*	data)
         for(idx = 0,itor = parentChildren->begin();itor!=parentChildren->end();itor++,idx++){
                 if((*itor)==view)break;
         }
-        switch((int)data)
+        switch((intptr_t)data)
         {
                 case    0       ://up
                         view = view->getParent();
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index c9edf98..05dd70b 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -383,8 +383,7 @@ LLFloaterTools::LLFloaterTools()
         mPanelLandInfo(NULL),
 
         mTabLand(NULL),
-        mDirty(TRUE),
-        mLastTool(gToolNull)
+        mDirty(TRUE)
 {
         mAutoFocus = FALSE;
         LLCallbackMap::map_t factory_map;
@@ -949,21 +948,13 @@ void LLFloaterTools::onClickGridOptions(void* data)
         //floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE);
 }
 
-void LLFloaterTools::saveLastTool()
-{
-        mLastTool = gToolMgr->getCurrentTool( MASK_NONE );
-}
-
 void LLFloaterTools::setEditTool(void* tool_pointer)
 {
         select_tool(tool_pointer);
-        if(gFloaterTools && tool_pointer != gToolNull)
-        {
-                gFloaterTools->saveLastTool();
-        }
 }
 
 void LLFloaterTools::onFocusReceived()
 {
-        select_tool(mLastTool);
+        gCurrentToolset = gBasicToolset;
+        gCurrentToolset->selectTool(gCurrentToolset->getSelectedTool());
 }
\ No newline at end of file
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index 343a898..a6c4ceb 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -175,7 +175,6 @@ public:
         LLPanelLandInfo                 *mPanelLandInfo;
 
         LLTabContainer*                 mTabLand;
-        LLTool*                                 mLastTool;
         
 private:
         BOOL                                    mDirty;
diff --git a/linden/indra/newview/llhippo.cpp b/linden/indra/newview/llhippo.cpp
index bcaf498..b2dd20f 100644
--- a/linden/indra/newview/llhippo.cpp
+++ b/linden/indra/newview/llhippo.cpp
@@ -51,7 +51,7 @@ void trigger_hippo_bug(void*)
                 {
                         chat = TRUE;
                 }
-                else if (frand(1.f) > 0.5f)
+                else if (ll_frand() > 0.5f)
                 {
                         chat = TRUE;
                 }
diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index a7e7a5e..db24875 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -369,9 +369,9 @@ void LLHUDEffectBeam::setupParticle(const S32 i)
         // Generate a random offset for the target point.
         const F32 SCALE = 0.5f;
         F32 x, y, z;
-        x = frand(SCALE) - 0.5f*SCALE;
-        y = frand(SCALE) - 0.5f*SCALE;
-        z = frand(SCALE) - 0.5f*SCALE;
+        x = ll_frand(SCALE) - 0.5f*SCALE;
+        y = ll_frand(SCALE) - 0.5f*SCALE;
+        z = ll_frand(SCALE) - 0.5f*SCALE;
 
         LLVector3d target_pos_global(mTargetPos);
         target_pos_global += LLVector3d(x, y, z);
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 04506c8..7864aa8 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -1966,11 +1966,12 @@ bool LLInventoryModel::loadFromFile(
                 llinfos << "unable to load inventory from: " << filename << llendl;
                 return false;
         }
+        // *NOTE: This buffer size is hard coded into scanf() below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         while(!feof(file) && fgets(buffer, MAX_STRING, file)) 
         {
-                sscanf(buffer, " %s", keyword);
+                sscanf(buffer, " %254s", keyword);
                 if(0 == strcmp("inv_category", keyword))
                 {
                         LLPointer<LLViewerInventoryCategory> inv_cat = new LLViewerInventoryCategory(LLUUID::null);
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 538e6df..20d77e0 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -107,9 +107,7 @@ void LLManip::getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3
                 LLVector3 arrow_axis;
                 getManipAxis(object, manip, arrow_axis);
 
-                LLVector3 origin_dir = grid_origin - gCamera->getOrigin();
-                origin_dir.normVec();
-                LLVector3 cross = arrow_axis % origin_dir;
+                LLVector3 cross = arrow_axis % gCamera->getAtAxis();
                 normal = cross % arrow_axis;
                 normal.normVec();
         }
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 2101e87..fc0046a 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -363,6 +363,8 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
                 return FALSE;
         }
 
+        // *NOTE: Changing the size of these buffers will require changes
+        // in the scanf below.
         char id_buffer[MAX_STRING];
         char name_buffer[MAX_STRING];
         char buffer[MAX_STRING];
@@ -372,7 +374,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
                 id_buffer[0] = '\0';
                 name_buffer[0] = '\0';
                 S32 type = 0;
-                sscanf(buffer, " %d %s %[^|]", &type, id_buffer, name_buffer);
+                sscanf(buffer, " %d %254s %254[^|]", &type, id_buffer, name_buffer);
                 LLUUID id = LLUUID(id_buffer);
                 LLMute mute(id, name_buffer, (LLMute::EType)type);
                 if (mute.mID.isNull()
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index d54f16b..8ba33a9 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -848,14 +848,17 @@ void LLPanelAvatarClassified::enableControls(BOOL self)
 BOOL LLPanelAvatarClassified::titleIsValid()
 {
         LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
-        for (S32 i = 0; i < tabs->getTabCount(); i++)
+        if ( tabs )
         {
-                LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
-                if ( ! panel->titleIsValid() )
+                LLPanelClassified* panel = (LLPanelClassified*)tabs->getCurrentPanel();
+                if ( panel )
                 {
-                        return FALSE;
-                }
-        }
+                        if ( ! panel->titleIsValid() )
+                        {
+                                return FALSE;
+                        };
+                };
+        };
 
         return TRUE;
 }
@@ -1659,7 +1662,8 @@ void LLPanelAvatar::onClickOK(void *userdata)
         {
                 self->sendAvatarPropertiesUpdate();
 
-                if ( self->mPanelClassified->titleIsValid() )
+                LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(self,"tab");
+                if ( tabs->getCurrentPanel() != self->mPanelClassified )
                 {
                         self->mPanelClassified->apply();
 
@@ -1669,6 +1673,19 @@ void LLPanelAvatar::onClickOK(void *userdata)
                                 infop->close();
                         }
                 }
+                else
+                {
+                        if ( self->mPanelClassified->titleIsValid() )
+                        {
+                                self->mPanelClassified->apply();
+
+                                LLFloaterAvatarInfo *infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID);
+                                if (infop)
+                                {
+                                        infop->close();
+                                }
+                        }
+                }
         }
 }
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 5eabad3..916db16 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -685,7 +685,7 @@ BOOL idle_startup()
                 gSavedSettings.loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml"));
 
                 // handle the per account settings setup
-                strcpy(gPerAccountSettingsFileName, gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE).c_str());
+                gPerAccountSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE);
 
                 // per account settings.  Set defaults here if not found.  If we get a bunch of these, eventually move to a function.
                 gSavedPerAccountSettings.loadFromFile(gPerAccountSettingsFileName);
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 0292417..63d167d 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -487,7 +487,7 @@ void LLTexLayerSetBuffer::readBackAndUpload(U8* baked_bump_data)
 // static
 void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* userdata, S32 result) // StoreAssetData callback (not fixed)
 {
-        LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)(U32)userdata;
+        LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)userdata;
 
         LLVOAvatar* avatar = gAgent.getAvatarObject();
 
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index de89965..86e58d1 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -57,8 +57,8 @@ LLControlGroup gCrashSettings;	// saved at end of session
 LLString gLastRunVersion;
 LLString gCurrentVersion;
 
-char gSettingsFileName[LL_MAX_PATH];
-char gPerAccountSettingsFileName[LL_MAX_PATH] = "";
+LLString gSettingsFileName;
+LLString gPerAccountSettingsFileName;
 
 LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater("Configuration Editor")
 {
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 06d666e..4be4313 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -72,8 +72,7 @@ extern LLControlGroup gCrashSettings;
 extern LLString gLastRunVersion;
 extern LLString gCurrentVersion;
 
-extern char gSettingsFileName[LL_MAX_PATH];
-extern char gPerAccountSettingsFileName[LL_MAX_PATH];
-extern const char *DEFAULT_SETTINGS_FILE;
+extern LLString gSettingsFileName;
+extern LLString gPerAccountSettingsFileName;
 
 #endif // LL_LLVIEWERCONTROL_H
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index ad1604e..7500ada 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -45,7 +45,6 @@
 #include "llvfs.h"
 #include "message.h"
 #include "lltimer.h"
-//#include "vmath.h"                    // For frand
 
 // viewer includes
 #include "llviewerimagelist.h"
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 1ed6525..487a9f8 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -449,6 +449,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
 
 bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
 {
+        // *NOTE: This buffer size is hard coded into scanf() below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         char valuestr[MAX_STRING];
@@ -458,7 +459,7 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
         while(!feof(fp))
         {
                 fgets(buffer, MAX_STRING, fp);
-                sscanf(buffer, " %s %s", keyword, valuestr);
+                sscanf(buffer, " %254s %254s", keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -491,7 +492,7 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %s %[^|]", keyword, valuestr);
+                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index 531cb89..c5ada54 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -704,6 +704,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
         FILE *fp;
         const S32 BUFFER_SIZE = 2048;
         char buffer[BUFFER_SIZE];
+        // *NOTE: This buffer size is hard coded into scanf() below.
         char mode_string[MAX_STRING];
         char key_string[MAX_STRING];
         char mask_string[MAX_STRING];
@@ -733,7 +734,7 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
                 if (buffer[0] == '#' || buffer[0] == '\n') continue;
 
                 // grab the binding strings
-                tokens_read = sscanf(buffer, "%s %s %s %s", mode_string, key_string, mask_string, function_string);
+                tokens_read = sscanf(buffer, "%254s %254s %254s %254s", mode_string, key_string, mask_string, function_string);
 
                 if (tokens_read == EOF)
                 {
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 921e650..3e5063e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -3965,6 +3965,7 @@ void force_import_geometry(void*)
                  child = root->getNextNamedChild())
         {
                 // get object data
+                // *NOTE: This buffer size is hard coded into scanf() below.
                 char name[255];                 // Shape
                 char description[255];  // Description
                 U32      material;                      // Material
@@ -3997,9 +3998,9 @@ void force_import_geometry(void*)
                 child->getAttributeString("PCode", &attribute);
                 pcode = atoi(attribute.c_str());
                 child->getAttributeString("Shape", &attribute);
-                sscanf(attribute.c_str(), "%s", name);
+                sscanf(attribute.c_str(), "%254s", name);
                 child->getAttributeString("Description", &attribute);
-                sscanf(attribute.c_str(), "%s", description);
+                sscanf(attribute.c_str(), "%254s", description);
                 child->getAttributeString("Material", &attribute);
                 material = atoi(attribute.c_str());
                 child->getAttributeString("Scale", &attribute);
@@ -4079,6 +4080,7 @@ void force_import_geometry(void*)
                         // read the faces
                         U32 facenumber;
                         LLColor4 color;
+                        // *NOTE: This buffer size is hard coded into scanf() below.
                         char texture[UUID_STR_LENGTH];
                         LLUUID texid;
                         texid.toString(texture);
@@ -4089,7 +4091,7 @@ void force_import_geometry(void*)
                         face->getAttributeString("FaceColor", &attribute);
                         sscanf(attribute, "%d %f %f %f %f", &facenumber, &color.mV[VX], &color.mV[VY], &color.mV[VZ], &color.mV[VW]);
                         face->getAttributeString("Face", &attribute);
-                        sscanf(attribute, "%d %f %f %f %f %f %d %s", &facenumber, &sx, &sy, &ox, &oy, &rot, &bump, texture);
+                        sscanf(attribute, "%d %f %f %f %f %f %d %36s", &facenumber, &sx, &sy, &ox, &oy, &rot, &bump, texture);
                         texid.set(texture);
                         te.setColor(color);
                         te.setBumpShinyFullbright(bump);
@@ -5025,7 +5027,7 @@ const char* upload_pick(void* data)
         LLFilePicker::ELoadFilter type;
         if(data)
         {
-                type = (LLFilePicker::ELoadFilter)((S32)data);
+                type = (LLFilePicker::ELoadFilter)((intptr_t)data);
         }
         else
         {
@@ -5506,7 +5508,8 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                  if (fscanf(in, "LindenResource\nversion %d\n", &version))              
                  {              
                          if (2 == version)              
-                         {              
+                         {
+                                                                // *NOTE: This buffer size is hard coded into scanf() below.
                                  char label[MAX_STRING];                
                                  char value[MAX_STRING];                
                                  S32  tokens_read;              
@@ -5514,7 +5517,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                  {              
                                          label[0] = '\0';               
                                          value[0] = '\0';               
-                                         tokens_read = sscanf(buf, "%s %s\n", label, value);            
+                                         tokens_read = sscanf(buf, "%254s %254s\n", label, value);              
 
                                          llinfos << "got: " << label << " = " << value          
                                                          << llendl;             
@@ -5930,7 +5933,7 @@ void handle_export_selected( void * )
 
 BOOL menu_check_build_tool( void* user_data )
 {
-        S32 index = (S32) user_data;
+        S32 index = (intptr_t) user_data;
         return gCurrentToolset->isToolSelected( index );
 }
 
@@ -6223,7 +6226,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
         {
                 bool new_value = false;
                 LLViewerObject* dest_object = NULL;
-                if(dest_object = gObjectList.findObject(gLastHitObjectID))
+                if((dest_object = gObjectList.findObject(gLastHitObjectID)))
                 {
                         if(dest_object->getPCode() == LL_PCODE_VOLUME)
                         {
@@ -8075,7 +8078,7 @@ void handle_debug_avatar_textures(void*)
 
 void handle_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data);
+        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
         LLVOAvatar* avatar = gAgent.getAvatarObject();
         if ( avatar )
         {
@@ -8166,7 +8169,7 @@ void handle_grab_texture(void* data)
 
 BOOL enable_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data);
+        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
         LLVOAvatar* avatar = gAgent.getAvatarObject();
         if ( avatar )
         {
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index ba5be0a..124ae13 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1999,7 +1999,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         && chatter != gAgent.getAvatarObject())
                 {
                         gAgent.heardChat(chat);
-                        if (gLindenLabRandomNumber.llrand(2) == 0) 
+                        if (ll_rand(2) == 0) 
                         {
                                 gAgent.setLookAt(LOOKAT_TARGET_AUTO_LISTEN, chatter, LLVector3::zero);
                         }                       
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index d034aa7..40930e6 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2396,6 +2396,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
         if(ifs.good())
         {
                 char buffer[MAX_STRING];
+                // *NOTE: This buffer size is hard coded into scanf() below.
                 char keyword[MAX_STRING];
                 if(mInventory)
                 {
@@ -2408,7 +2409,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
                 while(ifs.good())
                 {
                         ifs.getline(buffer, MAX_STRING);
-                        sscanf(buffer, " %s", keyword);
+                        sscanf(buffer, " %254s", keyword);
                         if(0 == strcmp("inv_item", keyword))
                         {
                                 LLPointer<LLInventoryObject> inv = new LLViewerInventoryItem;
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 1175553..be2c90f 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -418,7 +418,7 @@ BOOL LLViewerPartSim::shouldAddPart()
                 F32 frac = (F32)sParticleCount/(F32)sMaxParticleCount;
                 frac -= 0.75;
                 frac *= 3.f;
-                if (frand(1.f) < frac)
+                if (ll_frand() < frac)
                 {
                         // Skip...
                         return FALSE;
@@ -549,9 +549,9 @@ void LLViewerPartSim::updateSimulation()
         // pain.
         S32 i;
         S32 count = mViewerPartSources.count();
-        S32 start = (S32)frand((F32)count);
+        S32 start = (S32)ll_frand((F32)count);
         S32 dir = 1;
-        if (frand(1.0) > 0.5f)
+        if (ll_frand() > 0.5f)
         {
                 dir = -1;
         }
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index ceb6761..39869e2 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -213,9 +213,9 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 F32 mvs;
                                 do
                                 {
-                                        part_dir_vector.mV[VX] = frand(2.f) - 1.f;
-                                        part_dir_vector.mV[VY] = frand(2.f) - 1.f;
-                                        part_dir_vector.mV[VZ] = frand(2.f) - 1.f;
+                                        part_dir_vector.mV[VX] = ll_frand(2.f) - 1.f;
+                                        part_dir_vector.mV[VY] = ll_frand(2.f) - 1.f;
+                                        part_dir_vector.mV[VZ] = ll_frand(2.f) - 1.f;
                                         mvs = part_dir_vector.magVecSquared();
                                 }
                                 while ((mvs > 1.f) || (mvs < 0.01f));
@@ -223,7 +223,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 part_dir_vector.normVec();
                                 part.mPosAgent += mPartSysData.mBurstRadius*part_dir_vector;
                                 part.mVelocity = part_dir_vector;
-                                F32 speed = mPartSysData.mBurstSpeedMin + frand(mPartSysData.mBurstSpeedMax - mPartSysData.mBurstSpeedMin);
+                                F32 speed = mPartSysData.mBurstSpeedMin + ll_frand(mPartSysData.mBurstSpeedMax - mPartSysData.mBurstSpeedMin);
                                 part.mVelocity *= speed;
                         }
                         else if (mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_ANGLE
@@ -242,10 +242,10 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 F32 outerAngle = mPartSysData.mOuterAngle;
 
                                 // generate a random angle within the given space...
-                                F32 angle = innerAngle + frand(outerAngle - innerAngle);
+                                F32 angle = innerAngle + ll_frand(outerAngle - innerAngle);
 
                                 // split which side it will go on randomly...
-                                if (frand(1.0) < 0.5) 
+                                if (ll_frand() < 0.5) 
                                 {
                                         angle = -angle;
                                 }
@@ -256,7 +256,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 // If this is a cone pattern, rotate again to create the cone.
                                 if (mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE)
                                 {
-                                        part_dir_vector.rotVec(frand(4*F_PI), 0.0, 0.0, 1.0);
+                                        part_dir_vector.rotVec(ll_frand(4*F_PI), 0.0, 0.0, 1.0);
                                 }
                                         
                                 // Only apply this rotation if using the deprecated angles. 
@@ -276,7 +276,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
 
                                 part.mVelocity = part_dir_vector;
 
-                                F32 speed = mPartSysData.mBurstSpeedMin + frand(mPartSysData.mBurstSpeedMax - mPartSysData.mBurstSpeedMin);
+                                F32 speed = mPartSysData.mBurstSpeedMin + ll_frand(mPartSysData.mBurstSpeedMax - mPartSysData.mBurstSpeedMin);
                                 part.mVelocity *= speed;
                         }
                         else
@@ -459,7 +459,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
                 part.mLastUpdateTime = 0.f;
                 part.mScale.mV[0] = 0.25f;
                 part.mScale.mV[1] = 0.25f;
-                part.mParameter = frand(F_TWO_PI);
+                part.mParameter = ll_frand(F_TWO_PI);
 
                 gWorldPointer->mPartSim.addPart(part);
         }
@@ -720,7 +720,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
                 part.mLastUpdateTime = 0.f;
                 part.mScale.mV[0] = 0.25f;
                 part.mScale.mV[1] = 0.25f;
-                part.mParameter = frand(F_TWO_PI);
+                part.mParameter = ll_frand(F_TWO_PI);
 
                 gWorldPointer->mPartSim.addPart(part);
         }
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index e1e783c..e04918e 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -57,8 +57,8 @@ public:
 
 const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
 {
-        // ST_MOUSELOOK_SECONDS
-        StatAttributes("Seconds in Mouselook", FALSE, TRUE),
+        // ST_VERSION
+        StatAttributes("Version", TRUE, FALSE),
         // ST_AVATAR_EDIT_SECONDS
         StatAttributes("Seconds in Edit Appearence", FALSE, TRUE),
         // ST_TOOLBOX_SECONDS
@@ -77,10 +77,10 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
         StatAttributes("Object rez count", FALSE, FALSE),
         // ST_FPS_10_SECONDS
         StatAttributes("Seconds below 10 FPS", FALSE, TRUE),
-        // ST_FPS_5_SECONDS
-        StatAttributes("Seconds below 5 FPS", FALSE, TRUE),
         // ST_FPS_2_SECONDS
         StatAttributes("Seconds below 2 FPS", FALSE, TRUE),
+        // ST_MOUSELOOK_SECONDS
+        StatAttributes("Seconds in Mouselook", FALSE, TRUE),
         // ST_FLY_COUNT
         StatAttributes("Fly count", FALSE, FALSE),
         // ST_TELEPORT_COUNT
@@ -248,10 +248,6 @@ void LLViewerStats::updateFrameStats(const F64 time_diff)
         {
                 incStat(LLViewerStats::ST_FPS_2_SECONDS, time_diff);
         }
-        if (time_diff >= 0.2)
-        {
-                incStat(LLViewerStats::ST_FPS_5_SECONDS, time_diff);
-        }
         if (time_diff >= 0.125)
         {
                 incStat(LLViewerStats::ST_FPS_8_SECONDS, time_diff);
diff --git a/linden/indra/newview/llviewerstats.h b/linden/indra/newview/llviewerstats.h
index 9b446ec..a3eb4c1 100644
--- a/linden/indra/newview/llviewerstats.h
+++ b/linden/indra/newview/llviewerstats.h
@@ -98,7 +98,7 @@ public:
         // in statTypeToText in llviewerstats.cpp
         enum EStatType
         {
-                ST_MOUSELOOK_SECONDS = 0,
+                ST_VERSION = 0,
                 ST_AVATAR_EDIT_SECONDS = 1,
                 ST_TOOLBOX_SECONDS = 2,
                 ST_CHAT_COUNT = 3,
@@ -108,8 +108,8 @@ public:
                 ST_CREATE_COUNT = 7,
                 ST_REZ_COUNT = 8,
                 ST_FPS_10_SECONDS = 9,
-                ST_FPS_5_SECONDS = 10,
-                ST_FPS_2_SECONDS = 11,
+                ST_FPS_2_SECONDS = 10,
+                ST_MOUSELOOK_SECONDS = 11,
                 ST_FLY_COUNT = 12,
                 ST_TELEPORT_COUNT = 13,
                 ST_OBJECT_DELETE_COUNT = 14,
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3d4f1c0..ece24e0 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2382,7 +2382,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
         static const F32 UPDATE_TIME = .5f;
         if (mUpdateLODTimer.hasExpired())
         {
-                mUpdateLODTimer.setTimerExpirySec(UPDATE_TIME * (.75f + frand(0.5f)));
+                mUpdateLODTimer.setTimerExpirySec(UPDATE_TIME * (.75f + ll_frand(0.5f)));
                 updateJointLODs();
         }
         
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index 048ae61..58e5378 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -229,26 +229,26 @@ void LLVOGrass::initClass()
         {
                 if (1)   //(i%2 == 0)                   Uncomment for X blading
                 {
-                        F32 u = sqrt(-2.0f * log(frand(1.0)));
-                        F32 v = 2.0f * F_PI * frand(1.0);
+                        F32 u = sqrt(-2.0f * log(ll_frand()));
+                        F32 v = 2.0f * F_PI * ll_frand();
                         
                         x = u * sin(v) * GRASS_DISTRIBUTION_SD;
                         y = u * cos(v) * GRASS_DISTRIBUTION_SD;
 
-                        rot = frand(F_PI);
+                        rot = ll_frand(F_PI);
                 }
                 else
                 {
-                        rot += (F_PI*0.4f + frand(0.2f*F_PI));
+                        rot += (F_PI*0.4f + ll_frand(0.2f*F_PI));
                 }
 
                 exp_x[i] = x;
                 exp_y[i] = y;
                 rot_x[i] = sin(rot);
                 rot_y[i] = cos(rot);
-                dz_x[i] = frand(GRASS_BLADE_BASE * 0.25f);
-                dz_y[i] = frand(GRASS_BLADE_BASE * 0.25f);
-                w_mod[i] = 0.5f + frand(1.f);                                           //  Degree to which blade is moved by wind
+                dz_x[i] = ll_frand(GRASS_BLADE_BASE * 0.25f);
+                dz_y[i] = ll_frand(GRASS_BLADE_BASE * 0.25f);
+                w_mod[i] = 0.5f + ll_frand();                                           //  Degree to which blade is moved by wind
 
         }
 }
diff --git a/linden/indra/newview/llvopart.cpp b/linden/indra/newview/llvopart.cpp
index 5e471be..6b38cf9 100644
--- a/linden/indra/newview/llvopart.cpp
+++ b/linden/indra/newview/llvopart.cpp
@@ -654,7 +654,7 @@ void LLVOPart::setParticleCountdownStateWaitingDead(const U32 particleNumber)
 
         frequency = mSpawnFrequency;
         // **** Hack!  remainingLifetime counts up from negative, to avoid subtracts! - djs
-        mParticleState[particleNumber].remainingLifetime = -(((mSpawnFrequencyRange * 2.0f)*frand(1.f)) + frequency - mSpawnFrequencyRange);
+        mParticleState[particleNumber].remainingLifetime = -(((mSpawnFrequencyRange * 2.0f)*ll_frand()) + frequency - mSpawnFrequencyRange);
 }
 
 //Can override later
@@ -672,9 +672,9 @@ void LLVOPart::spawnParticle(const U32 particleNumber)
         mDeadArr[particleNumber] = 0; // not dead yet!
 
         //j = pos_offset_i(particleNumber);
-        mParticleState[particleNumber].position[0] = 2.f*mSpawnRange*(frand(1.f)) - mSpawnRange;
-        mParticleState[particleNumber].position[1] = 2.f*mSpawnRange*(frand(1.f)) - mSpawnRange;
-        mParticleState[particleNumber].position[2] = 2.f*mSpawnRange*(frand(1.f)) - mSpawnRange;
+        mParticleState[particleNumber].position[0] = 2.f*mSpawnRange*(ll_frand()) - mSpawnRange;
+        mParticleState[particleNumber].position[1] = 2.f*mSpawnRange*(ll_frand()) - mSpawnRange;
+        mParticleState[particleNumber].position[2] = 2.f*mSpawnRange*(ll_frand()) - mSpawnRange;
         
         //mParticleStateArray[j] = (pos_ranges[1] - pos_ranges[0])*(F32)rand()/((F32)RAND_MAX) + pos_ranges[0];
         //j++;
@@ -687,12 +687,12 @@ void LLVOPart::spawnParticle(const U32 particleNumber)
         //Create the ranged direction vector first - then rotate by the actual direction and then scale
         //Creating a random value about 1,0,0
         //1. pick a random angle YZ orientation through full circle.
-        randomUnitValue = (frand(1.f));
+        randomUnitValue = (ll_frand());
         direction.mV[VY] = sinf(randomUnitValue * 2.0 * F_PI);
         direction.mV[VZ] = cosf(randomUnitValue * 2.0 * F_PI);
 
         //2. pick a rotation to this angle to project into z which is scaled by mSpawnDirectionRange
-        randomUnitValue = (frand(1.f));
+        randomUnitValue = (ll_frand());
         randomUnitValue *= mSpawnDirectionRange;
         direction.mV[VY] = direction.mV[VY] * sinf(randomUnitValue * F_PI);
         direction.mV[VZ] = direction.mV[VZ] * sinf(randomUnitValue * F_PI);
@@ -804,7 +804,7 @@ void LLVOPart::spawnParticle(const U32 particleNumber)
 
 
         //4. scale the vector by a random scale by mSpawnVelocityRange and offset by mSpawnVelocity
-        randomUnitValue = (frand(1.f));
+        randomUnitValue = (ll_frand());
         randomUnitValue = (randomUnitValue * mSpawnVelocityRange) + mSpawnVelocity;
 
         mParticleState[particleNumber].velocity[0] = direction.mV[VX] * randomUnitValue;
@@ -822,16 +822,16 @@ void LLVOPart::spawnParticle(const U32 particleNumber)
         
         mParticleState[particleNumber].acceleration[2] = 0.0f;
 
-        mParticleState[particleNumber].scale[0] = (mScale_range[1] - mScale_range[0])*frand(1.f) + mScale_range[0];
-        mParticleState[particleNumber].scale[1] = (mScale_range[3] - mScale_range[2])*frand(1.f) + mScale_range[2];
+        mParticleState[particleNumber].scale[0] = (mScale_range[1] - mScale_range[0])*ll_frand() + mScale_range[0];
+        mParticleState[particleNumber].scale[1] = (mScale_range[3] - mScale_range[2])*ll_frand() + mScale_range[2];
         mParticleState[particleNumber].scale[2] = 0.0f;
 
-        mParticleState[particleNumber].alpha[0] = (mAlpha_range[1] - mAlpha_range[0])*frand(1.f) + mAlpha_range[0];
-        mParticleState[particleNumber].alpha[1] = (mAlpha_range[3] - mAlpha_range[2])*frand(1.f) + mAlpha_range[2];
+        mParticleState[particleNumber].alpha[0] = (mAlpha_range[1] - mAlpha_range[0])*ll_frand() + mAlpha_range[0];
+        mParticleState[particleNumber].alpha[1] = (mAlpha_range[3] - mAlpha_range[2])*ll_frand() + mAlpha_range[2];
         mParticleState[particleNumber].alpha[2] = 0.0f;
 
         // **** Hack!  remainingLifetime counts up from negative, to avoid subtracts! - djs
-        mParticleState[particleNumber].remainingLifetime = -((mIndividualLifetimeRange*2.0f)*frand(1.f) + mIndividualLifetime - mIndividualLifetimeRange);
+        mParticleState[particleNumber].remainingLifetime = -((mIndividualLifetimeRange*2.0f)*ll_frand() + mIndividualLifetime - mIndividualLifetimeRange);
 
         //rest of the state - 0 for now
         mParticleState[particleNumber].deathOffset = 0.0f; 
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 10a765d..150f5cd 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -53,7 +53,7 @@ LLVOPartGroup::LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegi
         setNumTEs(1);
         setTETexture(0, LLUUID::null);
         mbCanSelect = FALSE;                    // users can't select particle systems
-        mDebugColor = LLColor4(frand(1.f), frand(1.f), frand(1.f), 1.f);
+        mDebugColor = LLColor4(ll_frand(), ll_frand(), ll_frand(), 1.f);
 }
 
 
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 927b784..559e846 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -664,20 +664,18 @@ void LLVOSky::restoreGL()
 
 void LLVOSky::updateHaze()
 {
-        time_t timer;
-        time(&timer);
-        static LLRand WeatherRandomNumber(gmtime(&timer)->tm_mday);
+        static LLRandLagFib607 weather_generator(LLUUID::getRandomSeed());
         if (gSavedSettings.getBOOL("FixedWeather"))
         {
-                WeatherRandomNumber.seed(8008135);
+                weather_generator.seed(8008135);
         }
 
         const F32 fo_upper_bound = 5;
         const F32 sca_upper_bound = 6;
-        const F32 fo = 1 + WeatherRandomNumber.llfrand(fo_upper_bound - 1);
+        const F32 fo = 1 + (F32)weather_generator() *(fo_upper_bound - 1);
         const static F32 upper = 0.5f / gFastLn.ln(fo_upper_bound);
         mHaze.setFalloff(fo);
-        mHaze.setG(WeatherRandomNumber.llfrand(0.0f + upper * gFastLn.ln(fo)));
+        mHaze.setG((F32)weather_generator() * (0.0f + upper * gFastLn.ln(fo)));
         LLColor3 sca;
         const F32 cd = mCloudDensity * 3;
         F32 min_r = cd - 1;
@@ -691,7 +689,7 @@ void LLVOSky::updateHaze()
                 max_r = sca_upper_bound;
         }
 
-        sca.mV[0] = min_r + WeatherRandomNumber.llfrand(max_r - min_r);//frand(6);
+        sca.mV[0] = min_r + (F32)weather_generator() * (max_r - min_r);
 
         min_r = sca.mV[0] - 0.1f;
         if (min_r < 0)
@@ -704,7 +702,7 @@ void LLVOSky::updateHaze()
                 max_r = sca_upper_bound;
         }
 
-        sca.mV[1] = min_r + WeatherRandomNumber.llfrand(max_r - min_r);
+        sca.mV[1] = min_r + (F32)weather_generator() * (max_r - min_r);
 
         min_r = sca.mV[1];
         if (min_r < 0)
@@ -717,7 +715,7 @@ void LLVOSky::updateHaze()
                 max_r = sca_upper_bound;
         }
 
-        sca.mV[2] = min_r + WeatherRandomNumber.llfrand(max_r - min_r);
+        sca.mV[2] = min_r + (F32)weather_generator() * (max_r - min_r);
 
         sca = AIR_SCA_AVG * sca;
 
diff --git a/linden/indra/newview/llvostars.cpp b/linden/indra/newview/llvostars.cpp
index d20c5da..3fd3b91 100644
--- a/linden/indra/newview/llvostars.cpp
+++ b/linden/indra/newview/llvostars.cpp
@@ -125,19 +125,19 @@ void LLVOStars::initStars()
         U32 i;
         for (i = 0; i < NUMBER_OF_STARS; i++ )
         {
-                v_p->mV[VX] = frand(1.f) - 0.5f;
-                v_p->mV[VY] = frand(1.f) - 0.5f;
+                v_p->mV[VX] = ll_frand() - 0.5f;
+                v_p->mV[VY] = ll_frand() - 0.5f;
                 
                 // we only want stars on the top half of the dome!
 
-                v_p->mV[VZ] = frand(1.f)/2.f;
+                v_p->mV[VZ] = ll_frand()/2.f;
 
                 v_p->normVec();
                 *v_p *= DISTANCE_TO_STARS;
-                *v_i = llmin((F32)pow(frand(1.f),2.f) + 0.1f, 1.f);
-                v_c->mV[VRED]   = 0.75f + frand(1.f) * 0.25f ;
+                *v_i = llmin((F32)pow(ll_frand(),2.f) + 0.1f, 1.f);
+                v_c->mV[VRED]   = 0.75f + ll_frand() * 0.25f ;
                 v_c->mV[VGREEN] = 1.f ;
-                v_c->mV[VBLUE]  = 0.75f + frand(1.f) * 0.25f ;
+                v_c->mV[VBLUE]  = 0.75f + ll_frand() * 0.25f ;
                 v_c->mV[VALPHA] = 1.f;
                 v_c->clamp();
                 v_p++;
@@ -179,7 +179,7 @@ void LLVOStars::updateStarColors()
                                 sundir_factor = (1 - how_close_to_sun) / sunclose_range;
                         }
                         intensity = *(v_i);
-                        F32 alpha = v_c->mV[VALPHA] + (frand(1.f) - 0.5f) * var * intensity;
+                        F32 alpha = v_c->mV[VALPHA] + (ll_frand() - 0.5f) * var * intensity;
                         if (alpha < min * intensity)
                         {
                                 alpha = min * intensity;
diff --git a/linden/indra/newview/llvotreenew.cpp b/linden/indra/newview/llvotreenew.cpp
index 40b0c58..d7fc635 100644
--- a/linden/indra/newview/llvotreenew.cpp
+++ b/linden/indra/newview/llvotreenew.cpp
@@ -138,9 +138,9 @@ void LLVOTreeNew::initClass()
         //LLVOTreeNew::sParameters = LLTreeParams();
 
         // initialize an array of random numbers that we'll be using
-        gLindenLabRandomNumber.seed(0);
+        LLRandLagFib607 tree_rand;
         for (i = 0; i < MAX_RAND_NUMS; i++)
-                sRandNums[i] = gLindenLabRandomNumber.llfrand(1.0);
+                sRandNums[i] = (F32)tree_rand();
 }
 
 /*
@@ -959,7 +959,8 @@ void LLVOTreeNew::drawTree(LLDrawPool &draw_pool)
         U8 i, j;
 
         // seed the drawtree thing with the object's uuid to make it original but predictable...
-        gLindenLabRandomNumber.seed(0);
+        // don't re-seed the process random number generator. bad.
+        //gLindenLabRandomNumber.seed(0);
 
         // reset the rand offsets
         for (i = 0; i < MAX_LEVELS; i++) mRandOffset[i] = 0;
diff --git a/linden/indra/newview/llvotreenew.h b/linden/indra/newview/llvotreenew.h
index 058bd19..936028a 100644
--- a/linden/indra/newview/llvotreenew.h
+++ b/linden/indra/newview/llvotreenew.h
@@ -78,7 +78,7 @@ public:
         // return +- negPos
         static S32 llrand_signed(S32 negPos)
         {
-                return (gLindenLabRandomNumber.llrand((U32)negPos * 2) - negPos);
+                return (ll_rand((U32)negPos * 2) - negPos);
         };
 
         static S32 llrand_signed(S32 negPos, U32 index)
@@ -94,7 +94,7 @@ public:
         // return +- negPos
         static F32 llfrand_signed(F32 negPos)
         {
-                return (gLindenLabRandomNumber.llfrand(negPos * 2.0f) - negPos);
+                return (ll_frand(negPos * 2.0f) - negPos);
         };
 
         static F32 llfrand_signed(F32 negPos, U32 index)
@@ -110,7 +110,7 @@ public:
         // return between 0-pos
         static F32 llfrand_unsigned(F32 pos)
         {
-                return gLindenLabRandomNumber.llfrand(pos);
+                return ll_frand(pos);
         };
 
         static void cleanupTextures() {};       // not needed anymore
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index 62a1d20..310eae5 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -265,6 +265,9 @@ BOOL LLWearable::exportFile( FILE* file )
 
 BOOL LLWearable::importFile( FILE* file )
 {
+        // *NOTE: changing the type or size of this buffer will require
+        // changes in the fscanf() code below. You would be better off
+        // rewriting this to use streams and not require an open FILE.
         char text_buffer[2048];
         S32 fields_read = 0;
 
@@ -295,7 +298,7 @@ BOOL LLWearable::importFile( FILE* file )
         else
         {
                 ungetc( next_char, file );
-                fields_read = fscanf( file, "%[^\n]", text_buffer );
+                fields_read = fscanf( file, "%2047[^\n]", text_buffer );
                 if( (1 != fields_read) || (fgetc( file ) != '\n') )
                 {
                         llwarns << "Bad Wearable asset: early end of file" << llendl;
@@ -315,7 +318,7 @@ BOOL LLWearable::importFile( FILE* file )
         else
         {
                 ungetc( next_char, file );
-                fields_read = fscanf( file, "%[^\n]", text_buffer );
+                fields_read = fscanf( file, "%2047[^\n]", text_buffer );
                 if( (1 != fields_read) || (fgetc( file ) != '\n') )
                 {
                         llwarns << "Bad Wearable asset: early end of file" << llendl;
@@ -422,7 +425,7 @@ BOOL LLWearable::importFile( FILE* file )
         for( i = 0; i < num_textures; i++ )
         {
                 S32 te = 0;
-                fields_read = fscanf( file, "%d %s\n", &te, text_buffer);
+                fields_read = fscanf( file, "%d %2047s\n", &te, text_buffer);
                 if( fields_read != 2 )
                 {
                         llwarns << "Bad Wearable asset: bad texture, #" << i << llendl;
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index afbff65..6d1ee28 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -251,8 +251,16 @@ void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 
         // don't browse to anything that starts with secondlife://
         if ( urlIn.length() >= protocol.length() )
+        {
                 if ( LLString::compareInsensitive( urlIn.substr( 0, protocol.length() ).c_str(), protocol.c_str() ) != 0 )
+                {
                         LLMozLib::getInstance()->navigateTo( mEmbeddedBrowserWindowId, urlIn );
+                }
+        }
+        else
+        {
+                LLMozLib::getInstance()->navigateTo( mEmbeddedBrowserWindowId, urlIn );
+        }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 57c72c5..bad6e88 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -254,4 +254,4 @@ class LLWebBrowserTexture : public LLDynamicTexture
 
 #endif // // LL_LIBXUL_ENABLED
 
-#endif // LL_LLWEBBROWSERCTRL_H
\ No newline at end of file
+#endif // LL_LLWEBBROWSERCTRL_H
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index a96a62a..4cce794 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,21 @@
+Release Notes for Second Life 1.13.2(15) January 25, 2007
+=====================================
+Changes:
+* Tapping Alt to focus on menus has been disabled
+* Separate settings.ini file used by Beta and First Look clients
+** Uninstalling these clients will no longer remove Second Life user settings
+
+Bug fixes:
+* Alt-mouseclick no longer puts focus on the menus
+* Popup warnings for sandbox regions reflect changes made in 1.13.2(11)
+* Fixed error while editing profile if you have a classified
+* Fixed Buy Pass option in pie menu not appearing unless access list for avatars is enabled
+* Fixed build tool not changing type until you use another menu
+* Fixed dragging position arrows sideways moves object vertically
+* Fixed clicking More/Less in editor selects Create
+* Fixed loud noise in wind on dual core systems
+* Fixed a client crash
+
 Release Notes for Second Life 1.13.2(12) January 19, 2007
 =====================================
 Bug fixes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 44aab17..cf7b935 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,7 +227,7 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,13,2,12
+ FILEVERSION 1,13,2,15
  PRODUCTVERSION 1,13,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -245,7 +245,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.13.2.12"
+            VALUE "FileVersion", "1.13.2.15"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2006, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
diff --git a/linden/indra/newview/rsyncfiles.txt b/linden/indra/newview/rsyncfiles.txt
new file mode 100644
index 0000000..0763c5c
--- /dev/null
+++ b/linden/indra/newview/rsyncfiles.txt
@@ -0,0 +1,22 @@
+- *.cpp
+- *.c
+- *.h
+- .svn/
+- CVS/
+- .cvsignore
+- .DS_Store
+- /app_settings/mozilla/
+- /app_settings/mozilla_debug/
++ /app_settings/
++ /character/
++ /help/
++ /trial/
++ /fonts/
++ /skins/
++ /cursors_mac/
++ /featuretable.txt
++ /featuretable_mac.txt
++ /releasenotes.txt
++ /lsl_guide.html
++ /secondlife.icns
++ /gpu_table.txt
diff --git a/linden/indra/newview/secondlife setup build firstlook.bat b/linden/indra/newview/secondlife setup build firstlook.bat
new file mode 100644
index 0000000..099f4fc
--- /dev/null
+++ b/linden/indra/newview/secondlife setup build firstlook.bat
@@ -0,0 +1,11 @@
+@rem Invoke the script which preps then runs the installer.

+@rem This batch file is customized per grid.

+

+set LOGINPAGEURL=http://secondlife.com/app/login/firstlook/

+set ARGS=/DFIRSTLOOK

+

+@rem To build optional "update" installer (doesn't have static VFS):

+@rem 

+@rem set ARGS=/DUPDATE

+

+@"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%

diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index 70defa7..747d1ca 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -802,9 +802,8 @@ You can edit your appearance as often as you like.
         <notify name="FirstSandbox" tip="false">
                 <message name="message">
                         This is a sandbox region.
-Objects you build here may be deleted after you 
-leave the area, and the region will be wiped 
-every [HOURS] hours starting at [TIME] AM Pacific Time.
+Objects you build here may be deleted after
+you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name.
  
 Sandbox regions are uncommon, and are marked with signs.
                 </message>
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index c009039..19b5260 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -352,7 +352,7 @@ BOOL				gDoneLogout = FALSE;
 
 BOOL                            gInitializationComplete = FALSE;        // used in windows handlers to determine if OK to call idle()
 BOOL                            gAutoLogin = FALSE;
-char                            gOldSettingsFileName[LL_MAX_PATH];
+LLString                        gOldSettingsFileName;
 BOOL                            gPrintMessagesThisFrame = FALSE;
 const char*                     DEFAULT_SETTINGS_FILE = "settings.xml";
 const char*                     LEGACY_DEFAULT_SETTINGS_FILE = "settings.ini";
@@ -925,8 +925,8 @@ int main( int argc, char **argv )
         //
 
         // Set up some defaults...
-        strcpy(gSettingsFileName, gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, DEFAULT_SETTINGS_FILE).c_str());
-        strcpy(gOldSettingsFileName, gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, LEGACY_DEFAULT_SETTINGS_FILE).c_str());
+        gSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, DEFAULT_SETTINGS_FILE);
+        gOldSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, LEGACY_DEFAULT_SETTINGS_FILE);
         gUserServer.setPort(DEFAULT_USER_SERVER_PORT);
 
         /////////////////////////////////////////
@@ -4215,7 +4215,7 @@ BOOL add_object( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         {
         case LL_PCODE_LEGACY_GRASS:
                 //  Randomize size of grass patch 
-                scale.setVec(10.f + frand(20.f), 10.f + frand(20.f),  1.f + frand(2.f));
+                scale.setVec(10.f + ll_frand(20.f), 10.f + ll_frand(20.f),  1.f + ll_frand(2.f));
                 state = rand() % LLVOGrass::sMaxGrassSpecies;
                 break;
 
@@ -5337,8 +5337,14 @@ void send_stats()
         gMessageSystem->addU32Fast(_PREHASH_SysRAM, gSysMemory.getPhysicalMemory());
         gMessageSystem->addStringFast(_PREHASH_SysOS, gSysOS.getOSString());
         gMessageSystem->addStringFast(_PREHASH_SysCPU, gSysCPU.getCPUStringTerse());
+
         
-        gMessageSystem->addStringFast(_PREHASH_SysGPU, gGLManager.getRawGLString());
+        std::string gpu_desc = llformat("%-6s Class %d ",
+                                                                        gGLManager.mGLVendorShort.substr(0,6).c_str(),
+                                                                        gFeatureManagerp->getGPUClass())
+                + gFeatureManagerp->getGPUString();
+
+        gMessageSystem->addStringFast(_PREHASH_SysGPU, gpu_desc);
 
         gMessageSystem->nextBlockFast(_PREHASH_DownloadTotals);
         gMessageSystem->addU32Fast(_PREHASH_World, gTotalWorldBytes);
@@ -5365,6 +5371,14 @@ void send_stats()
         gMessageSystem->addU32Fast(_PREHASH_OffCircuit, (U32)gMessageSystem->mOffCircuitPackets);
         gMessageSystem->addU32Fast(_PREHASH_Invalid, (U32)gMessageSystem->mInvalidOnCircuitPackets);
 
+        // 1.00.00.000000
+        F64 version =
+                LL_VERSION_MAJOR * 10000000000.0 +
+                LL_VERSION_MINOR *   100000000.0 +
+                LL_VERSION_PATCH *     1000000.0 +
+                LL_VERSION_BUILD;
+        gViewerStats->setStat(LLViewerStats::ST_VERSION, version);
+        
         gViewerStats->addToMessage();
 
         gAgent.sendReliableMessage();
@@ -5596,7 +5610,7 @@ int parse_args(int argc, char **argv)
                         std::string folder(argv[j]);
                         gDirUtilp->setSkinFolder(folder);
                 }
-                else if (!strcmp(argv[j], "--autologin"))
+                else if (!strcmp(argv[j], "-autologin") || !strcmp(argv[j], "--autologin")) // keep --autologin for compatibility
                 {
                         gAutoLogin = TRUE;
                 }
@@ -5731,8 +5745,9 @@ int parse_args(int argc, char **argv)
                 }
                 else if (!strcmp(argv[j], "-logfile") && (++j < argc)) 
                 {
+                        // *NOTE: This buffer size is hard coded into scanf() below.
                         char logfile[256];
-                        sscanf(argv[j], "%s", logfile);
+                        sscanf(argv[j], "%255s", logfile);
                         llinfos << "Setting log file to " << logfile << llendl;
                         LLFile::remove(logfile);
                         if (!gErrorStream.setFile(logfile))
@@ -5742,7 +5757,7 @@ int parse_args(int argc, char **argv)
                 }
                 else if (!strcmp(argv[j], "-settings") && (++j < argc)) 
                 {
-                        strcpy(gSettingsFileName, argv[j]);
+                        gSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, argv[j]);
                 }
                 else if (!strcmp(argv[j], "-setdefault") && (j + 2 < argc)) 
                 {
@@ -6475,7 +6490,7 @@ void cleanup_app()
         // Must do this after all panels have been deleted because panels that have persistent rects
         // save their rects on delete.
         gSavedSettings.saveToFile(gSettingsFileName, TRUE);
-        if (gPerAccountSettingsFileName[0])
+        if (!gPerAccountSettingsFileName.empty())
         {
                 gSavedPerAccountSettings.saveToFile(gPerAccountSettingsFileName, TRUE);
         }
diff --git a/linden/indra/newview/viewer.h b/linden/indra/newview/viewer.h
index ed302ce..34ca249 100644
--- a/linden/indra/newview/viewer.h
+++ b/linden/indra/newview/viewer.h
@@ -95,7 +95,7 @@ extern LLTimer gLogoutTimer;
 extern BOOL gInProductionGrid;
 extern S32 gCrashBehavior;
 extern bool gVerifySSLCert;
-
+extern const char* DEFAULT_SETTINGS_FILE;
 
 // TODO: Eliminate most of these, move into a globals structure.
 extern const U32 PATCH_SIZE;