Second Life viewer sources 1.19.1.0

1 files changed, 130 insertions, 18 deletions

diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index bdaf133..4e31151 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -49,6 +49,7 @@
 #include "llfloaterbuycurrency.h"
 #include "llfloaterchat.h"
 #include "llfloaterdirectory.h"         // to spawn search
+#include "llfloaterlagmeter.h"
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
@@ -126,7 +127,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
         mSquareMetersCommitted(0)
 {
         // status bar can possible overlay menus?
-        mMouseOpaque = FALSE;
+        setMouseOpaque(FALSE);
         setIsChrome(TRUE);
 
         // size of day of the weeks and year
@@ -163,8 +164,49 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
         childSetCommitCallback("search_editor", onCommitSearch, this);
         childSetAction("search_btn", onClickSearch, this);
 
+        childSetVisible("search_editor", gSavedSettings.getBOOL("ShowSearchBar"));
+        childSetVisible("search_btn", gSavedSettings.getBOOL("ShowSearchBar"));
+
         childSetActionTextbox("ParcelNameText", onClickParcelInfo );
         childSetActionTextbox("BalanceText", onClickBalance );
+
+        // Adding Net Stat Graph
+        S32 x = getRect().getWidth() - 2;
+        S32 y = 0;
+        LLRect r;
+        r.set( x-SIM_STAT_WIDTH, y+MENU_BAR_HEIGHT-1, x, y+1);
+        mSGBandwidth = new LLStatGraph("BandwidthGraph", r);
+        mSGBandwidth->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
+        mSGBandwidth->setStat(&gViewerStats->mKBitStat);
+        LLString text = childGetText("bandwidth_tooltip") + " ";
+        LLUIString bandwidth_tooltip = text;    // get the text from XML until this widget is XML driven
+        mSGBandwidth->setLabel(bandwidth_tooltip.getString().c_str());
+        mSGBandwidth->setUnits("Kbps");
+        mSGBandwidth->setPrecision(0);
+        mSGBandwidth->setMouseOpaque(FALSE);
+        addChild(mSGBandwidth);
+        x -= SIM_STAT_WIDTH + 2;
+
+        r.set( x-SIM_STAT_WIDTH, y+MENU_BAR_HEIGHT-1, x, y+1);
+        mSGPacketLoss = new LLStatGraph("PacketLossPercent", r);
+        mSGPacketLoss->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
+        mSGPacketLoss->setStat(&gViewerStats->mPacketsLostPercentStat);
+        text = childGetText("packet_loss_tooltip") + " ";
+        LLUIString packet_loss_tooltip = text;  // get the text from XML until this widget is XML driven
+        mSGPacketLoss->setLabel(packet_loss_tooltip.getString().c_str());
+        mSGPacketLoss->setUnits("%");
+        mSGPacketLoss->setMin(0.f);
+        mSGPacketLoss->setMax(5.f);
+        mSGPacketLoss->setThreshold(0, 0.5f);
+        mSGPacketLoss->setThreshold(1, 1.f);
+        mSGPacketLoss->setThreshold(2, 3.f);
+        mSGPacketLoss->setPrecision(1);
+        mSGPacketLoss->setMouseOpaque(FALSE);
+        mSGPacketLoss->mPerSec = FALSE;
+        addChild(mSGPacketLoss);
+
+        childSetActionTextbox("stat_btn", onClickStatGraph);
+
 }
 
 LLStatusBar::~LLStatusBar()
@@ -199,9 +241,9 @@ void LLStatusBar::draw()
 {
         refresh();
 
-        if (mBgVisible)
+        if (isBackgroundVisible())
         {
-                gl_drop_shadow(0, mRect.getHeight(), mRect.getWidth(), 0, 
+                gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0, 
                                 LLUI::sColorsGroup->getColor("ColorDropShadow"), 
                                 LLUI::sConfigGroup->getS32("DropShadowFloater") );
         }
@@ -212,6 +254,14 @@ void LLStatusBar::draw()
 // Per-frame updates of visibility
 void LLStatusBar::refresh()
 {
+        // Adding Net Stat Meter back in
+        F32 bwtotal = gViewerThrottle.getMaxBandwidth() / 1000.f;
+        mSGBandwidth->setMin(0.f);
+        mSGBandwidth->setMax(bwtotal*1.25f);
+        mSGBandwidth->setThreshold(0, bwtotal*0.75f);
+        mSGBandwidth->setThreshold(1, bwtotal);
+        mSGBandwidth->setThreshold(2, bwtotal);
+
         // *TODO: Localize / translate time
         
         // Get current UTC time, adjusted for the user's clock
@@ -262,6 +312,8 @@ void LLStatusBar::refresh()
         S32 x = MENU_RIGHT + MENU_PARCEL_SPACING;
         S32 y = 0;
         
+        bool search_visible = gSavedSettings.getBOOL("ShowSearchBar");
+
         // reshape menu bar to its content's width
         if (MENU_RIGHT != gMenuBarView->getRect().getWidth())
         {
@@ -454,7 +506,7 @@ void LLStatusBar::refresh()
 
                 mRegionDetails.mTime = mTextTime->getText();
                 mRegionDetails.mBalance = mBalance;
-                mRegionDetails.mAccesString = (char *)region->getSimAccessString();
+                mRegionDetails.mAccesString = region->getSimAccessString();
                 mRegionDetails.mPing = region->getNetDetailsForLCD();
                 if (parcel && !parcel->getName().empty())
                 {
@@ -466,7 +518,7 @@ void LLStatusBar::refresh()
 
                         // keep these around for the LCD to use
                         mRegionDetails.mRegionName = region->getName();
-                        mRegionDetails.mParcelName = (char *)parcel->getName().c_str();
+                        mRegionDetails.mParcelName = parcel->getName();
                         mRegionDetails.mX = pos_x;
                         mRegionDetails.mY = pos_y;
                         mRegionDetails.mZ = pos_z;
@@ -476,7 +528,7 @@ void LLStatusBar::refresh()
                         
                         if (parcel->isPublic())
                         {
-                                snprintf(mRegionDetails.mOwner, MAX_STRING, "Public");
+                                mRegionDetails.mOwner = "Public";
                         }
                         else
                         {
@@ -488,16 +540,13 @@ void LLStatusBar::refresh()
                                         }
                                         else
                                         {
-                                                snprintf(mRegionDetails.mOwner, MAX_STRING, "Group Owned");
+                                                mRegionDetails.mOwner = "Group Owned";
                                         }
                                 }
                                 else
                                 {
                                         // Figure out the owner's name
-                                        char owner_first[MAX_STRING];   /*Flawfinder: ignore*/
-                                        char owner_last[MAX_STRING];    /*Flawfinder: ignore*/
-                                        gCacheName->getName(parcel->getOwnerID(), owner_first, owner_last);
-                                        snprintf(mRegionDetails.mOwner, MAX_STRING, "%s %s", owner_first, owner_last);          /* Flawfinder: ignore */
+                                        gCacheName->getFullName(parcel->getOwnerID(), mRegionDetails.mOwner);
                                 }
                         }
                 }
@@ -516,7 +565,7 @@ void LLStatusBar::refresh()
                         mRegionDetails.mZ = pos_z;
                         mRegionDetails.mArea = 0;
                         mRegionDetails.mForSale = FALSE;
-                        snprintf(mRegionDetails.mOwner, MAX_STRING, "Unknown");
+                        mRegionDetails.mOwner = "Unknown";
                         mRegionDetails.mTraffic = 0.0f;
                 }
         }
@@ -525,7 +574,7 @@ void LLStatusBar::refresh()
                 // no region
                 location_name = "(Unknown)";
                 // keep these around for the LCD to use
-                mRegionDetails.mRegionName = LLString("Unknown");
+                mRegionDetails.mRegionName = "Unknown";
                 mRegionDetails.mParcelName = "Unknown";
                 mRegionDetails.mAccesString = "Unknown";
                 mRegionDetails.mX = 0;
@@ -533,17 +582,72 @@ void LLStatusBar::refresh()
                 mRegionDetails.mZ = 0;
                 mRegionDetails.mArea = 0;
                 mRegionDetails.mForSale = FALSE;
-                snprintf(mRegionDetails.mOwner, MAX_STRING, "Unknown");
+                mRegionDetails.mOwner = "Unknown";
                 mRegionDetails.mTraffic = 0.0f;
         }
+
         mTextParcelName->setText(location_name);
 
+
+
+        // x = right edge
+        // loop through: stat graphs, search btn, search text editor, money, buy money, clock
+        // adjust rect
+        // finally adjust parcel name rect
+
+        S32 new_right = getRect().getWidth();
+        if (search_visible)
+        {
+                childGetRect("search_btn", r);
+                r.translate( new_right - r.mRight, 0);
+                childSetRect("search_btn", r);
+                new_right -= r.getWidth();
+
+                childGetRect("search_editor", r);
+                r.translate( new_right - r.mRight, 0);
+                childSetRect("search_editor", r);
+                new_right -= r.getWidth() + 6;
+
+        }
+        else
+        {
+                childGetRect("stat_btn", r);
+                r.translate( new_right - r.mRight, 0);
+                childSetRect("stat_btn", r);
+                new_right -= r.getWidth() + 6;
+        }
+
+        // Set rects of money, buy money, time
+        childGetRect("BalanceText", r);
+        r.translate( new_right - r.mRight, 0);
+        childSetRect("BalanceText", r);
+        new_right -= r.getWidth() - 18;
+
+        childGetRect("buycurrency", r);
+        r.translate( new_right - r.mRight, 0);
+        childSetRect("buycurrency", r);
+        new_right -= r.getWidth() + 6;
+
+        childGetRect("TimeText", r);
+        // mTextTime->getTextPixelWidth();
+        r.translate( new_right - r.mRight, 0);
+        childSetRect("TimeText", r);
+        // new_right -= r.getWidth() + MENU_PARCEL_SPACING;
+
+
         // Adjust region name and parcel name
         x += 8;
 
         const S32 PARCEL_RIGHT =  llmin(mTextTime->getRect().mLeft, mTextParcelName->getTextPixelWidth() + x + 5);
-        r.set(x+4, mRect.getHeight() - 2, PARCEL_RIGHT, 0);
+        r.set(x+4, getRect().getHeight() - 2, PARCEL_RIGHT, 0);
         mTextParcelName->setRect(r);
+
+        // Set search bar visibility
+        childSetVisible("search_editor", search_visible);
+        childSetVisible("search_btn", search_visible);
+        mSGBandwidth->setVisible(! search_visible);
+        mSGPacketLoss->setVisible(! search_visible);
+        childSetEnabled("stat_btn", ! search_visible);
 }
 
 void LLStatusBar::setVisibleForMouselook(bool visible)
@@ -553,6 +657,8 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
         childSetVisible("buycurrency", visible);
         childSetVisible("search_editor", visible);
         childSetVisible("search_btn", visible);
+        mSGBandwidth->setVisible(visible);
+        mSGPacketLoss->setVisible(visible);
         setBackgroundVisible(visible);
 }
 
@@ -664,7 +770,7 @@ static void onClickParcelInfo(void* data)
 {
         gParcelMgr->selectParcelAt(gAgent.getPositionGlobal());
 
-        LLFloaterLand::show();
+        LLFloaterLand::showInstance();
 }
 
 static void onClickBalance(void* data)
@@ -734,7 +840,7 @@ static void onClickBuyLand(void*)
 void LLStatusBar::setupDate()
 {
         // fill the day array with what's in the xui
-        LLString day_list = getFormattedUIString("StatBarDaysOfWeek");
+        LLString day_list = getString("StatBarDaysOfWeek");
         size_t length = day_list.size();
         
         // quick input check
@@ -758,7 +864,7 @@ void LLStatusBar::setupDate()
         }
         
         // fill the day array with what's in the xui    
-        LLString month_list = getFormattedUIString( "StatBarMonthsOfYear" );
+        LLString month_list = getString( "StatBarMonthsOfYear" );
         length = month_list.size();
         
         // quick input check
@@ -808,6 +914,12 @@ void LLStatusBar::onClickSearch(void* data)
         LLFloaterDirectory::showFindAll(search_text);
 }
 
+// static
+void LLStatusBar::onClickStatGraph(void* data)
+{
+        LLFloaterLagMeter::show(data);
+}
+
 BOOL can_afford_transaction(S32 cost)
 {
         return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));