diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-03-20 21:41:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-03-20 21:41:26 +0000 |
| commit | e3b97ac65b10a58c1dac041743e4acd1042492f5 (patch) | |
| tree | 1648189fd15e51ac1c2eb8d8018faa775c93f6d3 /indra/newview/llagent.cpp | |
| parent | b502c86f30d3ed01b795548364ab8090363eeac5 (diff) | |
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index ac92ee8525..4dab653d19 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -273,8 +273,7 @@ void LLAgentFriendObserver::changed(U32 mask) // LLAgent() //----------------------------------------------------------------------------- LLAgent::LLAgent() -: mViewerPort(NET_USE_OS_ASSIGNED_PORT), - mDrawDistance( DEFAULT_FAR_PLANE ), +: mDrawDistance( DEFAULT_FAR_PLANE ), mDoubleTapRunTimer(), mDoubleTapRunMode(DOUBLETAP_NONE), @@ -455,8 +454,6 @@ void LLAgent::init() mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject"); // LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f); - gSavedSettings.getControl("RenderHideGroupTitle")->addListener(&mHideGroupTitleListener); - gSavedSettings.getControl("EffectColor")->addListener(&mEffectColorListener); mEffectColor = gSavedSettings.getColor4("EffectColor"); @@ -7466,19 +7463,6 @@ void LLAgent::userRemoveAllAttachments( void* userdata ) gMessageSystem->sendReliable( gAgent.getRegionHost() ); } -bool LLAgent::LLHideGroupTitleListener::handleEvent(LLPointer<LLEvent> event, const LLSD &userdata) -{ - gAgent.setHideGroupTitle(event->getValue()); - return true; - -} - -bool LLAgent::LLEffectColorListener::handleEvent(LLPointer<LLEvent> event, const LLSD &userdata) -{ - gAgent.setEffectColor(LLColor4(event->getValue())); - return true; -} - void LLAgent::observeFriends() { if(!mFriendObserver) |