Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining dead LCD code(, also fix typo in a comment)

Browse Source
This commit is contained in:
Lirusaito
2013-01-31 21:32:29 -05:00
parent 46ddc9b6be
commit 5b2e1a0aae
6 changed files with 1 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloaterpreference.cpp
View File

@@ -136,7 +136,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
mMsgPanel(NULL),
mSkinsPanel(NULL),
mGridsPanel(NULL),
mLCDPanel(NULL),
mPrefsAscentChat(NULL),
mPrefsAscentSys(NULL),
mPrefsAscentVan(NULL)

2
indra/newview/llfloaterpreference.h
View File

@@ -44,7 +44,6 @@
class HippoPanelGrids;
class LLPanelGeneral;
class LLPanelInput;
class LLPanelLCD;
class LLPanelDisplay;
class LLPanelAudioPrefs;
class LLPanelDebug;
@@ -97,7 +96,6 @@ private:
LLPrefsIM *mPrefsIM;
LLPanelWeb *mWebPanel;
LLPanelMsgs *mMsgPanel;
LLPanelLCD *mLCDPanel;
LLPrefsAscentChat *mPrefsAscentChat;
LLPrefsAscentSys *mPrefsAscentSys;
LLPrefsAscentVan *mPrefsAscentVan;

64
indra/newview/llstatusbar.cpp
View File

@@ -503,51 +503,12 @@ void LLStatusBar::refresh()
pos_y -= pos_y % 2;
}
mRegionDetails.mTime = mTextTime->getText();
mRegionDetails.mBalance = mBalance;
mRegionDetails.mAccessString = region->getSimAccessString();
mRegionDetails.mPing = region->getNetDetailsForLCD();
if (parcel)
{
if (!LLAgentUI::buildLocationString(location_name, LLAgentUI::LOCATION_FORMAT_FULL))
{
location_name = "???";
}
// keep these around for the LCD to use
mRegionDetails.mRegionName = region->getName();
mRegionDetails.mParcelName = parcel->getName();
mRegionDetails.mX = pos_x;
mRegionDetails.mY = pos_y;
mRegionDetails.mZ = pos_z;
mRegionDetails.mArea = parcel->getArea();
mRegionDetails.mForSale = parcel->getForSale();
mRegionDetails.mTraffic = LLViewerParcelMgr::getInstance()->getDwelling();
if (parcel->isPublic())
{
mRegionDetails.mOwner = "Public";
}
else
{
if (parcel->getIsGroupOwned())
{
if(!parcel->getGroupID().isNull())
{
gCacheName->getGroupName(parcel->getGroupID(), mRegionDetails.mOwner);
}
else
{
mRegionDetails.mOwner = "Group Owned";
}
}
else
{
// Figure out the owner's name
gCacheName->getFullName(parcel->getOwnerID(), mRegionDetails.mOwner);
}
}
}
else
{
@@ -555,40 +516,17 @@ void LLStatusBar::refresh()
+ llformat(" %d, %d, %d (%s)",
pos_x, pos_y, pos_z,
region->getSimAccessString().c_str());
// 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;
mRegionDetails.mOwner = "Unknown";
mRegionDetails.mTraffic = 0.0f;
}
}
else
{
// no region
location_name = "(Unknown)";
// keep these around for the LCD to use
mRegionDetails.mRegionName = "Unknown";
mRegionDetails.mParcelName = "Unknown";
mRegionDetails.mAccessString = "Unknown";
mRegionDetails.mX = 0;
mRegionDetails.mY = 0;
mRegionDetails.mZ = 0;
mRegionDetails.mArea = 0;
mRegionDetails.mForSale = FALSE;
mRegionDetails.mOwner = "Unknown";
mRegionDetails.mTraffic = 0.0f;
}
// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ) // region == NULL if we loose our connection to the grid
if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ) // region == NULL if we lose our connection to the grid
{
// TODO-RLVa: find out whether the LCD code is still used because if so then we need to filter that as well
location_name = llformat("%s (%s) - %s",
RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(),
RlvStrings::getString(RLV_STRING_HIDDEN).c_str());

35
indra/newview/llstatusbar.h
View File

@@ -48,40 +48,6 @@ class LLUUID;
class LLFrameTimer;
class LLStatGraph;
// used by LCD screen
class LLRegionDetails
{
public:
LLRegionDetails() :
mRegionName("Unknown"),
mParcelName("Unknown"),
mAccessString("Unknown"),
mX(0),
mY(0),
mZ(0),
mArea (0),
mForSale(FALSE),
mOwner("Unknown"),
mTraffic(0),
mBalance(0),
mPing(0)
{
}
std::string mRegionName;
std::string mParcelName;
std::string mAccessString;
S32 mX;
S32 mY;
S32 mZ;
S32 mArea;
BOOL mForSale;
std::string mOwner;
F32 mTraffic;
S32 mBalance;
std::string mTime;
U32 mPing;
};
class LLStatusBar
: public LLPanel
{
@@ -116,7 +82,6 @@ public:
S32 getSquareMetersCredit() const;
S32 getSquareMetersCommitted() const;
S32 getSquareMetersLeft() const;
LLRegionDetails mRegionDetails;
private:
// simple method to setup the part that holds the date

5
indra/newview/llviewerregion.cpp
View File

@@ -936,11 +936,6 @@ void LLViewerRegion::calculateCameraDistance()
mCameraDistanceSquared = (F32)(gAgentCamera.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared();
}
U32 LLViewerRegion::getNetDetailsForLCD()
{
return mPingDelay;
}
std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region)
{
s << "{ ";

4
indra/newview/llviewerregion.h
View File

@@ -326,10 +326,6 @@ public:
void calculateCameraDistance();
friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region);
// used by LCD to get details for debug screen
U32 getNetDetailsForLCD();
/// implements LLCapabilityProvider
virtual std::string getDescription() const;
std::string getHttpUrl() const { return mHttpUrl ;}