1 files changed, 99 insertions, 59 deletions

diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 9bbb25f..8c50eca 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -48,6 +48,7 @@
 #include "llviewercontrol.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterchat.h"
+#include "llfloaterdirectory.h"         // to spawn search
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
@@ -150,53 +151,6 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
         mTextHealth = LLUICtrlFactory::getTextBoxByName( this, "HealthText" );
         mTextTime = LLUICtrlFactory::getTextBoxByName( this, "TimeText" );
         
-        S32 x = mRect.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);
-        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->mPerSec = FALSE;
-        addChild(mSGPacketLoss);
-
-}
-
-LLStatusBar::~LLStatusBar()
-{
-        delete mBalanceTimer;
-        mBalanceTimer = NULL;
-
-        delete mHealthTimer;
-        mHealthTimer = NULL;
-
-        // LLView destructor cleans up children
-}
-
-BOOL LLStatusBar::postBuild()
-{
         childSetAction("scriptout", onClickScriptDebug, this);
         childSetAction("health", onClickHealth, this);
         childSetAction("fly", onClickFly, this);
@@ -207,17 +161,31 @@ BOOL LLStatusBar::postBuild()
         childSetAction("restrictpush", onClickPush, this );
         childSetAction("status_voice", onClickVoice, this );
 
+        childSetCommitCallback("search_editor", onCommitSearch, this);
+        childSetAction("search_btn", onClickSearch, this);
+
         childSetActionTextbox("ParcelNameText", onClickParcelInfo );
         childSetActionTextbox("BalanceText", onClickBalance );
+}
+
+LLStatusBar::~LLStatusBar()
+{
+        delete mBalanceTimer;
+        mBalanceTimer = NULL;
+
+        delete mHealthTimer;
+        mHealthTimer = NULL;
 
-        return TRUE;
+        // LLView destructor cleans up children
 }
 
+//virtual
 EWidgetType LLStatusBar::getWidgetType() const
 {
         return WIDGET_TYPE_STATUS_BAR;
 }
 
+//virtual
 LLString LLStatusBar::getWidgetTag() const
 {
         return LL_STATUS_BAR_TAG;
@@ -245,13 +213,6 @@ void LLStatusBar::draw()
 // Per-frame updates of visibility
 void LLStatusBar::refresh()
 {
-        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
@@ -464,6 +425,10 @@ void LLStatusBar::refresh()
                         pos_y -= pos_y % 2;
                 }
 
+                mRegionDetails.mTime = mTextTime->getText();
+                mRegionDetails.mBalance = mBalance;
+                mRegionDetails.mAccesString = (char *)region->getSimAccessString();
+                mRegionDetails.mPing = region->getNetDetailsForLCD();
                 if (parcel && !parcel->getName().empty())
                 {
                         location_name = region->getName()
@@ -471,6 +436,43 @@ void LLStatusBar::refresh()
                                                    pos_x, pos_y, pos_z,
                                                    region->getSimAccessString(),
                                                    parcel->getName().c_str());
+
+                        // keep these around for the LCD to use
+                        mRegionDetails.mRegionName = region->getName();
+                        mRegionDetails.mParcelName = (char *)parcel->getName().c_str();
+                        mRegionDetails.mX = pos_x;
+                        mRegionDetails.mY = pos_y;
+                        mRegionDetails.mZ = pos_z;
+                        mRegionDetails.mArea = parcel->getArea();
+                        mRegionDetails.mForSale = parcel->getForSale();
+                        mRegionDetails.mTraffic = gParcelMgr->getDwelling();
+                        
+                        if (parcel->isPublic())
+                        {
+                                snprintf(mRegionDetails.mOwner, MAX_STRING, "Public");
+                        }
+                        else
+                        {
+                                if (parcel->getIsGroupOwned())
+                                {
+                                        if(!parcel->getGroupID().isNull())
+                                        {
+                                                gCacheName->getGroupName(parcel->getGroupID(), mRegionDetails.mOwner);
+                                        }
+                                        else
+                                        {
+                                                snprintf(mRegionDetails.mOwner, MAX_STRING, "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 */
+                                }
+                        }
                 }
                 else
                 {
@@ -478,12 +480,34 @@ void LLStatusBar::refresh()
                                 + llformat(" %d, %d, %d (%s)", 
                                                    pos_x, pos_y, pos_z,
                                                    region->getSimAccessString());
+                        // keep these around for the LCD to use
+                        mRegionDetails.mRegionName = region->getName();
+                        mRegionDetails.mParcelName = "Unknown";
+                        
+                        mRegionDetails.mX = pos_x;
+                        mRegionDetails.mY = pos_y;
+                        mRegionDetails.mZ = pos_z;
+                        mRegionDetails.mArea = 0;
+                        mRegionDetails.mForSale = FALSE;
+                        snprintf(mRegionDetails.mOwner, MAX_STRING, "Unknown");
+                        mRegionDetails.mTraffic = 0.0f;
                 }
         }
         else
         {
                 // no region
                 location_name = "(Unknown)";
+                // keep these around for the LCD to use
+                mRegionDetails.mRegionName = LLString("Unknown");
+                mRegionDetails.mParcelName = "Unknown";
+                mRegionDetails.mAccesString = "Unknown";
+                mRegionDetails.mX = 0;
+                mRegionDetails.mY = 0;
+                mRegionDetails.mZ = 0;
+                mRegionDetails.mArea = 0;
+                mRegionDetails.mForSale = FALSE;
+                snprintf(mRegionDetails.mOwner, MAX_STRING, "Unknown");
+                mRegionDetails.mTraffic = 0.0f;
         }
         mTextParcelName->setText(location_name);
 
@@ -499,9 +523,9 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
 {
         mTextBalance->setVisible(visible);
         mTextTime->setVisible(visible);
-        mSGBandwidth->setVisible(visible);
-        mSGPacketLoss->setVisible(visible);
         childSetVisible("buycurrency", visible);
+        childSetVisible("search_editor", visible);
+        childSetVisible("search_btn", visible);
         setBackgroundVisible(visible);
 }
 
@@ -517,8 +541,9 @@ void LLStatusBar::creditBalance(S32 credit)
 
 void LLStatusBar::setBalance(S32 balance)
 {
-        LLString balance_str;
-        gResMgr->getMonetaryString( balance_str, balance );
+        LLString money_str = gResMgr->getMonetaryString( balance );
+        LLString balance_str = "L$";
+        balance_str += money_str;
         mTextBalance->setText( balance_str );
 
         if (mBalance && (fabs((F32)(mBalance - balance)) > gSavedSettings.getF32("UISndMoneyChangeThreshold")))
@@ -742,6 +767,21 @@ void LLStatusBar::setupDate()
         }
 }
 
+// static
+void LLStatusBar::onCommitSearch(LLUICtrl*, void* data)
+{
+        // committing is the same as clicking "search"
+        onClickSearch(data);
+}
+
+// static
+void LLStatusBar::onClickSearch(void* data)
+{
+        LLStatusBar* self = (LLStatusBar*)data;
+        LLString search_text = self->childGetText("search_editor");
+        LLFloaterDirectory::showFindAll(search_text);
+}
+
 BOOL can_afford_transaction(S32 cost)
 {
         return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));