diff options
| author | James Cook <james@lindenlab.com> | 2009-12-02 16:22:01 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-02 16:22:01 -0800 |
| commit | 6684da77caff9cd7883060872748b5024b2d530c (patch) | |
| tree | 29384f1469bd8f8e70522176530c4022bf2a1e7b /indra/newview/llfloaterpreference.cpp | |
| parent | 1758e65163e80f88f9c782f9e936e9dbf2f9e296 (diff) | |
| parent | b615962908eabd20f80dffba02af61712652822c (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 5128a7b861..b01ff74e26 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -106,7 +106,6 @@ #include "llviewermedia.h" #include "llpluginclassmedia.h" #include "llteleporthistorystorage.h" -#include "llnearbychat.h" #include <boost/regex.hpp> @@ -362,7 +361,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) BOOL LLFloaterPreference::postBuild() { gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLIMFloater::processChatHistoryStyleUpdate, _2)); - + gSavedSettings.getControl("PlainTextChatHistory")->getSignal()->connect(boost::bind(&LLNearbyChat::processChatHistoryStyleUpdate, _2)); LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); @@ -370,6 +369,10 @@ BOOL LLFloaterPreference::postBuild() tabcontainer->selectFirstTab(); S32 show_avatar_nametag_options = gSavedSettings.getS32("AvatarNameTagMode"); handleNameTagOptionChanged(LLSD(show_avatar_nametag_options)); + + std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""); + childSetText("cache_location", cache_location); + return TRUE; } |