From ae88605f72ef43be7b619b8c1c11a508ebae5057 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:46:01 -0500
Subject: Second Life viewer sources 1.20.14
---
linden/indra/llcommon/llversionviewer.h | 2 +-
linden/indra/llui/llscrolllistctrl.h | 7 +-
linden/indra/newview/app_settings/settings.xml | 11 ++
.../shaders/class1/objects/fullbrightF.glsl | 0
.../shaders/class1/objects/fullbrightShinyV.glsl | 0
.../shaders/class1/objects/fullbrightV.glsl | 0
.../shaders/class1/objects/fullbrightWaterF.glsl | 0
.../shaders/class1/objects/shinyWaterF.glsl | 0
.../shaders/class1/objects/simpleWaterF.glsl | 0
.../shaders/class2/environment/terrainWaterF.glsl | 0
.../shaders/class2/objects/shinyV.glsl | 0
.../installers/windows/installer_template.nsi | 20 +++
linden/indra/newview/llfloaterhud.cpp | 7 +-
linden/indra/newview/llfloaterhud.h | 2 -
linden/indra/newview/llfloaterpostcard.cpp | 2 +
linden/indra/newview/llfloaterpreference.cpp | 25 ++--
linden/indra/newview/llfloatersnapshot.cpp | 36 ++---
linden/indra/newview/llimpanel.cpp | 22 ++-
linden/indra/newview/llimview.cpp | 38 +++--
linden/indra/newview/llpanellogin.cpp | 17 ++-
linden/indra/newview/llpanellogin.h | 1 +
linden/indra/newview/llstartup.cpp | 3 +-
linden/indra/newview/llviewercontrol.h | 2 +-
linden/indra/newview/llviewerimage.cpp | 4 +-
linden/indra/newview/llviewerimagelist.cpp | 10 +-
linden/indra/newview/llviewermenufile.cpp | 5 +-
linden/indra/newview/llviewerwindow.cpp | 4 +
linden/indra/newview/mozilla-theme/classic.jar | Bin 190670 -> 194180 bytes
linden/indra/newview/newview.vcproj | 3 +
linden/indra/newview/releasenotes.txt | 53 ++++++-
linden/indra/newview/skins/default/colors_base.xml | 2 +-
.../newview/skins/default/textures/textures.xml | 5 +-
.../indra/newview/skins/default/xui/de/alerts.xml | 5 +
.../newview/skins/default/xui/de/floater_about.xml | 6 +-
.../skins/default/xui/de/need_to_translate.xml | 55 +++++++
.../indra/newview/skins/default/xui/de/notify.xml | 5 +
.../default/xui/de/panel_preferences_skins.xml | 14 ++
.../newview/skins/default/xui/en-us/alerts.xml | 2 +-
.../skins/default/xui/en-us/floater_about.xml | 6 +-
.../skins/default/xui/en-us/floater_about_land.xml | 2 +-
.../skins/default/xui/en-us/floater_hud.xml | 7 +-
.../newview/skins/default/xui/en-us/floater_im.xml | 2 +-
.../xui/en-us/floater_skin_preview_template.xml | 80 +++++++++++
.../skins/default/xui/en-us/floater_snapshot.xml | 2 +-
.../default/xui/en-us/panel_preferences_skins.xml | 6 +-
.../newview/skins/default/xui/es/floater_about.xml | 26 ----
.../newview/skins/default/xui/fr/floater_about.xml | 26 ----
.../indra/newview/skins/default/xui/ja/alerts.xml | 5 +
.../newview/skins/default/xui/ja/floater_about.xml | 6 +-
.../skins/default/xui/ja/floater_joystick.xml | 158 ++++++++++-----------
.../skins/default/xui/ja/need_to_translate.xml | 73 ++++++++++
.../indra/newview/skins/default/xui/ja/notify.xml | 5 +
.../default/xui/ja/panel_preferences_skins.xml | 14 ++
.../default/xui/ja/panel_speaker_controls.xml | 6 +-
.../indra/newview/skins/default/xui/ko/alerts.xml | 5 +
.../newview/skins/default/xui/ko/floater_about.xml | 4 +-
.../skins/default/xui/ko/floater_joystick.xml | 25 ++--
.../skins/default/xui/ko/need_to_translate.xml | 63 ++++++++
.../indra/newview/skins/default/xui/ko/notify.xml | 5 +
.../default/xui/ko/panel_preferences_skins.xml | 14 ++
.../newview/skins/default/xui/pt/floater_about.xml | 27 ----
.../skins/default/xui/pt/floater_buy_land.xml | 19 ++-
.../newview/skins/default/xui/zh/floater_about.xml | 38 ++---
63 files changed, 691 insertions(+), 301 deletions(-)
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class2/environment/terrainWaterF.glsl
mode change 100755 => 100644 linden/indra/newview/app_settings/shaders/class2/objects/shinyV.glsl
create mode 100644 linden/indra/newview/skins/default/xui/de/panel_preferences_skins.xml
create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_skin_preview_template.xml
create mode 100644 linden/indra/newview/skins/default/xui/ja/panel_preferences_skins.xml
create mode 100644 linden/indra/newview/skins/default/xui/ko/panel_preferences_skins.xml
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index c93718a..21f7286 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 13;
+const S32 LL_VERSION_PATCH = 14;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 8a31154..667a89a 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -212,7 +212,8 @@ public:
mMaxContentWidth(0),
mIndex(-1),
mParentCtrl(NULL),
- mHeader(NULL)
+ mHeader(NULL),
+ mFontAlignment(LLFontGL::LEFT)
{ }
LLScrollListColumn(const LLSD &sd)
@@ -256,6 +257,10 @@ public:
{
mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
}
+ else
+ {
+ mFontAlignment = LLFontGL::LEFT;
+ }
mIndex = -1;
mParentCtrl = NULL;
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 4957948..e31c149 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7714,6 +7714,17 @@
4
+ TutorialURL
+
TypeAheadTimeout