From 672a76d0ea08a0d0fc824e103ee4c4242b7e03ec Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sat, 15 Mar 2008 01:18:27 +0000 Subject: reverting premature commit at 82410. --- indra/newview/llagent.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/newview/llagent.cpp') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 4dab653d19..ac92ee8525 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -273,7 +273,8 @@ void LLAgentFriendObserver::changed(U32 mask) // LLAgent() //----------------------------------------------------------------------------- LLAgent::LLAgent() -: mDrawDistance( DEFAULT_FAR_PLANE ), +: mViewerPort(NET_USE_OS_ASSIGNED_PORT), + mDrawDistance( DEFAULT_FAR_PLANE ), mDoubleTapRunTimer(), mDoubleTapRunMode(DOUBLETAP_NONE), @@ -454,6 +455,8 @@ 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"); @@ -7463,6 +7466,19 @@ void LLAgent::userRemoveAllAttachments( void* userdata ) gMessageSystem->sendReliable( gAgent.getRegionHost() ); } +bool LLAgent::LLHideGroupTitleListener::handleEvent(LLPointer event, const LLSD &userdata) +{ + gAgent.setHideGroupTitle(event->getValue()); + return true; + +} + +bool LLAgent::LLEffectColorListener::handleEvent(LLPointer event, const LLSD &userdata) +{ + gAgent.setEffectColor(LLColor4(event->getValue())); + return true; +} + void LLAgent::observeFriends() { if(!mFriendObserver) -- cgit v1.2.3