livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release 

reverting jakes accidental check in
master
Don Kjer 2007-06-29 01:49:41 +00:00
parent e3989d3848
commit ad04e5fc55
12 changed files with 4 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llfloaterchat.cpp
View File

@ -47,9 +47,6 @@
#include "llfloaterhtml.h"
#include "llweb.h"
// Used for LCD display
extern void AddNewIMToLCD(const LLString &newLine);
extern void AddNewChatToLCD(const LLString &newLine);
//
// Constants
//
@ -343,20 +340,6 @@ void LLFloaterChat::addChat(const LLChat& chat,
chat.mChatType == CHAT_TYPE_DEBUG_MSG
&& !gSavedSettings.getBOOL("ScriptErrorsAsChat");
#if LL_WINDOWS
// add into LCD displays
if (!invisible_script_debug_chat)
{
if (!from_instant_message)
{
AddNewChatToLCD(chat.mText);
}
else
{
AddNewIMToLCD(chat.mText);
}
}
#endif
if (!invisible_script_debug_chat
&& !chat.mMuted
&& gConsole

35
indra/newview/llfloaterpreference.cpp
View File

@ -31,7 +31,6 @@
#include "llpaneldebug.h"
#include "llpanelgeneral.h"
#include "llpanelinput.h"
#include "llpanelLCD.h"
#include "llpanelmsgs.h"
#include "llpanelweb.h"
#include "llprefschat.h"
@ -57,14 +56,6 @@ const S32 PREF_FLOATER_MIN_HEIGHT = 2 * SCROLLBAR_SIZE + 2 * LLPANEL_BORDER_WIDT
LLFloaterPreference* LLFloaterPreference::sInstance = NULL;
#if LL_WINDOWS
// for Logitech LCD keyboards / speakers
#ifndef LL_LOGITECH_LCD_H
#include "lllogitechlcd.h"
#endif
extern llLCD *gLcdScreen;
#endif
// Must be done at run time, not compile time. JC
S32 pref_min_width()
{
@ -93,7 +84,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
mDisplayPanel(NULL),
mDisplayPanel2(NULL),
mAudioPanel(NULL),
mLCDPanel(NULL),
mMsgPanel(NULL)
{
mGeneralPanel = new LLPanelGeneral();
@ -138,15 +128,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
mPrefsIM->getPanel()->setDefaultBtn(default_btn);
#if LL_WINDOWS
// only add this option if we actually have a logitech keyboard / speaker set
if (gLcdScreen->Enabled())
{
mLCDPanel = new LLPanelLCD();
mTabContainer->addTabPanel(mLCDPanel, mLCDPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mLCDPanel->setDefaultBtn(default_btn);
}
#endif
mMsgPanel = new LLPanelMsgs();
mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mMsgPanel->setDefaultBtn(default_btn);
@ -231,14 +212,6 @@ void LLPreferenceCore::apply()
#if LL_LIBXUL_ENABLED
mWebPanel->apply();
#endif
#if LL_WINDOWS
// only add this option if we actually have a logitech keyboard / speaker set
if (gLcdScreen->Enabled())
{
mLCDPanel->apply();
}
#endif
// mWebPanel->apply();
}
@ -257,14 +230,6 @@ void LLPreferenceCore::cancel()
#if LL_LIBXUL_ENABLED
mWebPanel->cancel();
#endif
#if LL_WINDOWS
// only add this option if we actually have a logitech keyboard / speaker set
if (gLcdScreen->Enabled())
{
mLCDPanel->cancel();
}
#endif
// mWebPanel->cancel();
}
// static

2
indra/newview/llfloaterpreference.h
View File

@ -20,7 +20,6 @@
class LLPanelGeneral;
class LLPanelInput;
class LLPanelLCD;
class LLPanelDisplay;
class LLPanelDisplay2;
class LLPanelDisplay3;
@ -66,7 +65,6 @@ private:
LLPrefsChat *mPrefsChat;
LLPrefsIM *mPrefsIM;
LLPanelMsgs *mMsgPanel;
LLPanelLCD *mLCDPanel;
LLPanelWeb *mWebPanel;
};

63
indra/newview/llstatusbar.cpp
View File

@ -403,10 +403,6 @@ 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())
{
location_name = region->getName()
@ -414,43 +410,6 @@ void LLStatusBar::refresh()
pos_x, pos_y, pos_z,
region->getSimAccessString(),
parcel->getName());
// keep these around for the LCD to use
mRegionDetails.mRegionName = region->getName();
mRegionDetails.mParcelName = (char *)parcel->getName();
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
{
@ -458,34 +417,12 @@ 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);

20
indra/newview/llstatusbar.h
View File

@ -24,25 +24,6 @@ class LLUUID;
class LLFrameTimer;
class LLStatGraph;
// used by LCD screen
class cLLRegionDetails
{
public:
LLString mRegionName;
char *mParcelName;
char *mAccesString;
S32 mX;
S32 mY;
S32 mZ;
S32 mArea;
BOOL mForSale;
char mOwner[MAX_STRING];
F32 mTraffic;
S32 mBalance;
LLString mTime;
U32 mPing;
};
class LLStatusBar
: public LLPanel
{
@ -79,7 +60,6 @@ public:
S32 getSquareMetersCredit() const;
S32 getSquareMetersCommitted() const;
S32 getSquareMetersLeft() const;
cLLRegionDetails mRegionDetails;
protected:
static void onClickParcelInfo(void*);

1
indra/newview/llviewerparcelmgr.h
View File

@ -107,7 +107,6 @@ public:
F32 getSelectionHeight() const { return F32(mEastNorth.mdV[VY] - mWestSouth.mdV[VY]); }
BOOL getSelection(LLVector3d &min, LLVector3d &max) { min = mWestSouth; max = mEastNorth; return !selectionEmpty();}
LLViewerRegion* getSelectionRegion();
F32 getDwelling() const { return mSelectedDwell;}
void getDisplayInfo(S32* area, S32* claim, S32* rent, BOOL* for_sale, F32* dwell);

5
indra/newview/llviewerregion.cpp
View File

@ -731,10 +731,7 @@ void LLViewerRegion::calculateCameraDistance()
mCameraDistanceSquared = (F32)(gAgent.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared();
}
U32 LLViewerRegion::getNetDetailsForLCD()
{
return mPingDelay;
}
// ---------------- Friends ----------------
std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region)
{

3
indra/newview/llviewerregion.h
View File

@ -212,9 +212,6 @@ public:
friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region);
// used by LCD to get details for debug screen
U32 getNetDetailsForLCD();
public:
struct CompareDistance
{

6
indra/newview/llviewerstats.cpp
View File

@ -153,11 +153,7 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
// ST_TEX_BAKES
StatAttributes("Texture Bakes", FALSE, FALSE),
// ST_TEX_REBAKES
StatAttributes("Texture Rebakes", FALSE, FALSE),
// ST_LOGITECH_KEYBOARD
StatAttributes("Logitech LCD", FALSE, FALSE)
StatAttributes("Texture Rebakes", FALSE, FALSE)
};
LLViewerStats::LLViewerStats()

3
indra/newview/llviewerstats.h
View File

@ -137,9 +137,8 @@ public:
ST_WINDOW_HEIGHT = 55,
ST_TEX_BAKES = 56,
ST_TEX_REBAKES = 57,
ST_LOGITECH_LCD = 58,
ST_COUNT = 59
ST_COUNT = 58
};

BIN
indra/newview/res/icon1.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 766 B

3
indra/newview/res/resource.h
View File

@ -19,7 +19,6 @@
#define IDB_LOGIN 149
#define IDC_CURSOR4 153
#define IDC_CURSOR5 154
#define IDI_LCD_LL_ICON 157
#define IDC_RADIO_56 1000
#define IDC_RADIO_128 1001
#define IDC_RADIO_256 1002
@ -152,7 +151,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 167
#define _APS_NEXT_RESOURCE_VALUE 156
#define _APS_NEXT_COMMAND_VALUE 40002
#define _APS_NEXT_CONTROL_VALUE 1139
#define _APS_NEXT_SYMED_VALUE 101