diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:51:10 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:51:10 -0500 |
| commit | d348deb7049cbaef7c228000525c7ee5a265464c (patch) | |
| tree | 810010b25bc5f0ba4511b40752f5f9ca7cb59b06 /indra/newview/llfloaterpreference.h | |
| parent | f7100331ebc7913d7117501ccac86f93f4ffb0e3 (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 31c1e2d9e5..22e80a21cb 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -143,7 +143,7 @@ public: void resetAllIgnored(); void setAllIgnored(); void onClickLogPath(); - void updateLogLocation(const std::string& dir_name); + bool moveTranscriptsAndLog(); void enableHistory(); void setPersonalInfo(const std::string& visibility, bool im_via_email); void refreshEnabledState(); |