diff options
| author | David Seikel | 2011-06-04 00:17:28 +1000 |
|---|---|---|
| committer | David Seikel | 2011-06-04 00:17:28 +1000 |
| commit | 492eaaf4eec82327116f2605e3d8becf94bec1b3 (patch) | |
| tree | dcddd674cb4861445c3ec5aaa59325b99a437614 /linden/indra/newview/llimpanel.cpp | |
| parent | Set the real bare minimum prim size to 0.00001, as 0 sized objects cause bugs. (diff) | |
| parent | Fixing the menu to actually use its color options reveals how broken the whol... (diff) | |
| download | meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.zip meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.tar.gz meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.tar.bz2 meta-impy-492eaaf4eec82327116f2605e3d8becf94bec1b3.tar.xz | |
Merge branch 'next' of git://github.com/jacek/imprudence into next
Conflicts (manually merged):
linden/indra/llcommon/llversionviewer.h
linden/indra/llvfs/lldir.cpp
linden/indra/llvfs/lldir_mac.cpp
linden/indra/newview/CMakeLists.txt
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/Info-Imprudence.plist
linden/indra/newview/Info-meta-impy.plist
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/packaging/mac/Info.plist.in
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerversion.cpp
linden/indra/newview/viewerversion.h
linden/install.xml
Also some post merge tweaks.
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
| -rw-r--r-- | linden/indra/newview/llimpanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 7ccf49c..752ebb4 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
| @@ -1660,7 +1660,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4 | |||
| 1660 | // Actually add the line | 1660 | // Actually add the line |
| 1661 | std::string timestring; | 1661 | std::string timestring; |
| 1662 | bool prepend_newline = true; | 1662 | bool prepend_newline = true; |
| 1663 | if (gSavedSettings.getBOOL("IMShowTimestamps")) | 1663 | if (gSavedSettings.getBOOL("ShowTimestamps")) |
| 1664 | { | 1664 | { |
| 1665 | timestring = mHistoryEditor->appendTime(prepend_newline); | 1665 | timestring = mHistoryEditor->appendTime(prepend_newline); |
| 1666 | prepend_newline = false; | 1666 | prepend_newline = false; |