aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linden/indra/newview/CMakeLists.txt2
-rw-r--r--linden/indra/newview/app_settings/dictionaries/en_sl.dic2
-rw-r--r--linden/indra/newview/app_settings/keywords.ini4
-rw-r--r--linden/indra/newview/app_settings/settings.xml17
-rw-r--r--linden/indra/newview/llfloaterland.cpp8
-rw-r--r--linden/indra/newview/llfloaterland.h2
-rw-r--r--linden/indra/newview/llfloaterpreference.cpp21
-rw-r--r--linden/indra/newview/llfloaterpreference.h2
-rw-r--r--linden/indra/newview/llglsandbox.cpp10
-rw-r--r--linden/indra/newview/llpaneldisplay.cpp29
-rw-r--r--linden/indra/newview/llpaneldisplay.h3
-rw-r--r--linden/indra/newview/llprefsadvanced.cpp27
-rw-r--r--linden/indra/newview/llprefschat.cpp51
-rw-r--r--linden/indra/newview/llprefscolors.cpp180
-rw-r--r--linden/indra/newview/llprefscolors.h67
-rw-r--r--linden/indra/newview/llselectmgr.cpp35
-rw-r--r--linden/indra/newview/llviewercamera.cpp4
-rw-r--r--linden/indra/newview/llvograss.cpp91
-rw-r--r--linden/indra/newview/llvograss.h9
-rw-r--r--linden/indra/newview/llvotree.cpp125
-rw-r--r--linden/indra/newview/llvotree.h14
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml51
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml248
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml115
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml45
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_radar.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml21
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py111
-rwxr-xr-xlinden/install.xml18
33 files changed, 888 insertions, 458 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index e3a1745..a4d99f2 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -333,6 +333,7 @@ set(viewer_SOURCE_FILES
333 llpolymorph.cpp 333 llpolymorph.cpp
334 llprefsadvanced.cpp 334 llprefsadvanced.cpp
335 llprefschat.cpp 335 llprefschat.cpp
336 llprefscolors.cpp
336 llprefsim.cpp 337 llprefsim.cpp
337 llprefsvoice.cpp 338 llprefsvoice.cpp
338 llpreviewanim.cpp 339 llpreviewanim.cpp
@@ -790,6 +791,7 @@ set(viewer_HEADER_FILES
790 llpolymorph.h 791 llpolymorph.h
791 llprefsadvanced.h 792 llprefsadvanced.h
792 llprefschat.h 793 llprefschat.h
794 llprefscolors.h
793 llprefsim.h 795 llprefsim.h
794 llprefsvoice.h 796 llprefsvoice.h
795 llpreview.h 797 llpreview.h
diff --git a/linden/indra/newview/app_settings/dictionaries/en_sl.dic b/linden/indra/newview/app_settings/dictionaries/en_sl.dic
index f37b60d..09076f7 100644
--- a/linden/indra/newview/app_settings/dictionaries/en_sl.dic
+++ b/linden/indra/newview/app_settings/dictionaries/en_sl.dic
@@ -1098,6 +1098,8 @@ STATUS_DIE_AT_EDGE
1098STATUS_RETURN_AT_EDGE 1098STATUS_RETURN_AT_EDGE
1099STATUS_CAST_SHADOWS 1099STATUS_CAST_SHADOWS
1100AGENT 1100AGENT
1101AGENT_BY_USERNAME
1102AGENT_BY_LEGACY_NAME
1101ACTIVE 1103ACTIVE
1102PASSIVE 1104PASSIVE
1103SCRIPTED 1105SCRIPTED
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 8e303dc..36a4cdc 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -66,7 +66,9 @@ STATUS_BLOCK_GRAB Passed in the llSetStatus library function. If TRUE, object c
66STATUS_DIE_AT_EDGE Passed in the llSetStatus library function. If TRUE, objects that reach the edge of the world just die:rather than teleporting back to the owner 66STATUS_DIE_AT_EDGE Passed in the llSetStatus library function. If TRUE, objects that reach the edge of the world just die:rather than teleporting back to the owner
67STATUS_RETURN_AT_EDGE Passed in the llSetStatus library function. If TRUE, script rezzed objects that reach the edge of the world:are returned rather than killed:STATUS_RETURN_AT_EDGE trumps STATUS_DIE_AT_EDGE if both are set 67STATUS_RETURN_AT_EDGE Passed in the llSetStatus library function. If TRUE, script rezzed objects that reach the edge of the world:are returned rather than killed:STATUS_RETURN_AT_EDGE trumps STATUS_DIE_AT_EDGE if both are set
68STATUS_CAST_SHADOWS Passed in the llSetStatus library function. If TRUE, object casts shadows on other objects 68STATUS_CAST_SHADOWS Passed in the llSetStatus library function. If TRUE, object casts shadows on other objects
69AGENT Passed in llSensor library function to look for other Agents 69AGENT Passed in llSensor library function to look for other Agents; DEPRECATED: Use AGENT_BY_LEGACY_NAME
70AGENT_BY_USERNAME Passed in llSensor library function to look for other Agents by username
71AGENT_BY_LEGACY_NAME Passed in llSensor library function to look for other Agents by legacy name
70ACTIVE Passed in llSensor library function to look for moving objects 72ACTIVE Passed in llSensor library function to look for moving objects
71PASSIVE Passed in llSensor library function to look for objects that aren't moving 73PASSIVE Passed in llSensor library function to look for objects that aren't moving
72SCRIPTED Passed in llSensor library function to look for scripted objects 74SCRIPTED Passed in llSensor library function to look for scripted objects
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 91ed5c2..22e4aa5 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6,7 +6,7 @@
6 6
7 <!-- begin name highlighting --> 7 <!-- begin name highlighting -->
8 8
9 <key>nick01</key> 9 <key>HighlightNickname01</key>
10 <map> 10 <map>
11 <key>Comment</key> 11 <key>Comment</key>
12 <string>First Nickname for Chat Highlight</string> 12 <string>First Nickname for Chat Highlight</string>
@@ -17,7 +17,7 @@
17 <key>Value</key> 17 <key>Value</key>
18 <string></string> 18 <string></string>
19 </map> 19 </map>
20 <key>nick02</key> 20 <key>HighlightNickname02</key>
21 <map> 21 <map>
22 <key>Comment</key> 22 <key>Comment</key>
23 <string>Second Nickname for Chat Highlight</string> 23 <string>Second Nickname for Chat Highlight</string>
@@ -28,7 +28,7 @@
28 <key>Value</key> 28 <key>Value</key>
29 <string></string> 29 <string></string>
30 </map> 30 </map>
31 <key>nick03</key> 31 <key>HighlightNickname03</key>
32 <map> 32 <map>
33 <key>Comment</key> 33 <key>Comment</key>
34 <string>Third Nickname for Chat Highlight</string> 34 <string>Third Nickname for Chat Highlight</string>
@@ -1183,6 +1183,17 @@
1183 <key>Value</key> 1183 <key>Value</key>
1184 <integer>0</integer> 1184 <integer>0</integer>
1185 </map> 1185 </map>
1186 <key>UseLocalChatWithBubbles</key>
1187 <map>
1188 <key>Comment</key>
1189 <string>Should local chat still appear even when using chat bubbles?</string>
1190 <key>Persist</key>
1191 <integer>1</integer>
1192 <key>Type</key>
1193 <string>Boolean</string>
1194 <key>Value</key>
1195 <integer>1</integer>
1196 </map>
1186 <key>UseUTCTime</key> 1197 <key>UseUTCTime</key>
1187 <map> 1198 <map>
1188 <key>Comment</key> 1199 <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index cc3e385..a6f39cb 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -209,7 +209,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
209 factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); 209 factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
210 factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this); 210 factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
211 factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this); 211 factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this);
212// factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this); 212 factory_map["land_audio_panel"] = LLCallbackMap(createPanelLandAudio, this);
213 factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); 213 factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this);
214 factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); 214 factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this);
215 215
@@ -245,7 +245,7 @@ void LLFloaterLand::refresh()
245 mPanelGeneral->refresh(); 245 mPanelGeneral->refresh();
246 mPanelObjects->refresh(); 246 mPanelObjects->refresh();
247 mPanelOptions->refresh(); 247 mPanelOptions->refresh();
248// mPanelAudio->refresh(); 248 mPanelAudio->refresh();
249 mPanelMedia->refresh(); 249 mPanelMedia->refresh();
250 mPanelAccess->refresh(); 250 mPanelAccess->refresh();
251} 251}
@@ -284,7 +284,7 @@ void* LLFloaterLand::createPanelLandOptions(void* data)
284 return self->mPanelOptions; 284 return self->mPanelOptions;
285} 285}
286 286
287/* 287
288// static 288// static
289void* LLFloaterLand::createPanelLandAudio(void* data) 289void* LLFloaterLand::createPanelLandAudio(void* data)
290{ 290{
@@ -292,7 +292,7 @@ void* LLFloaterLand::createPanelLandAudio(void* data)
292 self->mPanelAudio = new LLPanelLandAudio(self->mParcel); 292 self->mPanelAudio = new LLPanelLandAudio(self->mParcel);
293 return self->mPanelAudio; 293 return self->mPanelAudio;
294} 294}
295*/ 295
296// static 296// static
297void* LLFloaterLand::createPanelLandMedia(void* data) 297void* LLFloaterLand::createPanelLandMedia(void* data)
298{ 298{
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 4105f44..f8968a7 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -117,7 +117,7 @@ protected:
117 LLPanelLandGeneral* mPanelGeneral; 117 LLPanelLandGeneral* mPanelGeneral;
118 LLPanelLandObjects* mPanelObjects; 118 LLPanelLandObjects* mPanelObjects;
119 LLPanelLandOptions* mPanelOptions; 119 LLPanelLandOptions* mPanelOptions;
120// LLPanelLandAudio* mPanelAudio; 120 LLPanelLandAudio* mPanelAudio;
121 LLPanelLandMedia* mPanelMedia; 121 LLPanelLandMedia* mPanelMedia;
122 LLPanelLandAccess* mPanelAccess; 122 LLPanelLandAccess* mPanelAccess;
123 LLPanelLandCovenant* mPanelCovenant; 123 LLPanelLandCovenant* mPanelCovenant;
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index b740725..2fe4b4d 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -64,6 +64,7 @@
64#include "llpanelskins.h" 64#include "llpanelskins.h"
65#include "llprefsadvanced.h" 65#include "llprefsadvanced.h"
66#include "llprefschat.h" 66#include "llprefschat.h"
67#include "llprefscolors.h"
67#include "llprefsvoice.h" 68#include "llprefsvoice.h"
68#include "llprefsim.h" 69#include "llprefsim.h"
69#include "llresizehandle.h" 70#include "llresizehandle.h"
@@ -133,6 +134,7 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
133 mAudioPanel(NULL), 134 mAudioPanel(NULL),
134 mMsgPanel(NULL), 135 mMsgPanel(NULL),
135 mSkinsPanel(NULL), 136 mSkinsPanel(NULL),
137 mPrefsColors(NULL),
136 mLCDPanel(NULL), 138 mLCDPanel(NULL),
137 mPrefsFonts(NULL), 139 mPrefsFonts(NULL),
138 mPrefsAdvanced(NULL) 140 mPrefsAdvanced(NULL)
@@ -165,13 +167,18 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
165 mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); 167 mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
166 mPrefsChat->getPanel()->setDefaultBtn(default_btn); 168 mPrefsChat->getPanel()->setDefaultBtn(default_btn);
167 169
168 mPrefsVoice = new LLPrefsVoice(); 170 mPrefsColors = new LLPrefsColors();
169 mTabContainer->addTabPanel(mPrefsVoice, mPrefsVoice->getLabel(), FALSE, onTabChanged, mTabContainer); 171 mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer);
170 mPrefsVoice->setDefaultBtn(default_btn); 172 mPrefsColors->setDefaultBtn(default_btn);
171 173
172 mPrefsIM = new LLPrefsIM(); 174 mPrefsIM = new LLPrefsIM();
173 mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer); 175 mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
174 mPrefsIM->getPanel()->setDefaultBtn(default_btn); 176 mPrefsIM->getPanel()->setDefaultBtn(default_btn);
177
178 mPrefsVoice = new LLPrefsVoice();
179 mTabContainer->addTabPanel(mPrefsVoice, mPrefsVoice->getLabel(), FALSE, onTabChanged, mTabContainer);
180 mPrefsVoice->setDefaultBtn(default_btn);
181
175 182
176#if LL_LCD_COMPILE 183#if LL_LCD_COMPILE
177 184
@@ -272,7 +279,11 @@ LLPreferenceCore::~LLPreferenceCore()
272 delete mPrefsFonts; 279 delete mPrefsFonts;
273 mPrefsFonts = NULL; 280 mPrefsFonts = NULL;
274 } 281 }
275 282 if (mPrefsColors)
283 {
284 delete mPrefsColors;
285 mPrefsColors = NULL;
286 }
276} 287}
277 288
278 289
@@ -290,6 +301,7 @@ void LLPreferenceCore::apply()
290 mSkinsPanel->apply(); 301 mSkinsPanel->apply();
291 mPrefsAdvanced->apply(); 302 mPrefsAdvanced->apply();
292 mPrefsFonts->apply(); 303 mPrefsFonts->apply();
304 mPrefsColors->apply();
293 305
294 // hardware menu apply 306 // hardware menu apply
295 LLFloaterHardwareSettings::instance()->apply(); 307 LLFloaterHardwareSettings::instance()->apply();
@@ -320,6 +332,7 @@ void LLPreferenceCore::cancel()
320 mSkinsPanel->cancel(); 332 mSkinsPanel->cancel();
321 mPrefsAdvanced->cancel(); 333 mPrefsAdvanced->cancel();
322 mPrefsFonts->cancel(); 334 mPrefsFonts->cancel();
335 mPrefsColors->cancel();
323 336
324 // cancel hardware menu 337 // cancel hardware menu
325 LLFloaterHardwareSettings::instance()->cancel(); 338 LLFloaterHardwareSettings::instance()->cancel();
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index e98c45c..c52f541 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -57,6 +57,7 @@ class LLPanelMsgs;
57class LLPanelSkins; 57class LLPanelSkins;
58class LLPrefsAdvanced; 58class LLPrefsAdvanced;
59class ImpPrefsFonts; 59class ImpPrefsFonts;
60class LLPrefsColors;
60class LLScrollListCtrl; 61class LLScrollListCtrl;
61 62
62class LLPreferenceCore 63class LLPreferenceCore
@@ -94,6 +95,7 @@ private:
94 LLPanelMsgs *mMsgPanel; 95 LLPanelMsgs *mMsgPanel;
95 LLPanelLCD *mLCDPanel; 96 LLPanelLCD *mLCDPanel;
96 LLPrefsAdvanced *mPrefsAdvanced; 97 LLPrefsAdvanced *mPrefsAdvanced;
98 LLPrefsColors *mPrefsColors;
97 ImpPrefsFonts* mPrefsFonts; 99 ImpPrefsFonts* mPrefsFonts;
98}; 100};
99 101
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index a487150..98c4d06 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -275,7 +275,11 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
275 virtual bool apply(LLViewerObject* vobjp) 275 virtual bool apply(LLViewerObject* vobjp)
276 { 276 {
277 LLDrawable* drawable = vobjp->mDrawable; 277 LLDrawable* drawable = vobjp->mDrawable;
278 if (!drawable || vobjp->getPCode() != LL_PCODE_VOLUME || vobjp->isAttachment()) 278 if (!drawable ||
279 ((vobjp->getPCode() != LL_PCODE_VOLUME) &&
280 (vobjp->getPCode() != LL_PCODE_LEGACY_TREE) &&
281 (vobjp->getPCode() != LL_PCODE_LEGACY_GRASS) )||
282 vobjp->isAttachment())
279 { 283 {
280 return true; 284 return true;
281 } 285 }
@@ -326,7 +330,9 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
326 LLViewerObject* vobjp = drawable->getVObj(); 330 LLViewerObject* vobjp = drawable->getVObj();
327 331
328 if (!drawable || !vobjp || 332 if (!drawable || !vobjp ||
329 vobjp->getPCode() != LL_PCODE_VOLUME || 333 ((vobjp->getPCode() != LL_PCODE_VOLUME) &&
334 (vobjp->getPCode() != LL_PCODE_LEGACY_TREE) &&
335 (vobjp->getPCode() != LL_PCODE_LEGACY_GRASS) )||
330 vobjp->isAttachment() || 336 vobjp->isAttachment() ||
331 (deselect && !vobjp->isSelected())) 337 (deselect && !vobjp->isSelected()))
332 { 338 {
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 15b4615..a5c0d97 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -267,9 +267,6 @@ BOOL LLPanelDisplay::postBuild()
267 267
268 // Object detail slider 268 // Object detail slider
269 mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance"); 269 mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
270 mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
271 mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
272 mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
273 mCtrlDrawDistance->setCallbackUserData(this); 270 mCtrlDrawDistance->setCallbackUserData(this);
274 271
275 // Object detail slider 272 // Object detail slider
@@ -636,8 +633,6 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
636 llassert(mAvatarText != NULL); 633 llassert(mAvatarText != NULL);
637 llassert(mLightingText != NULL); 634 llassert(mLightingText != NULL);
638 llassert(mTerrainText != NULL); 635 llassert(mTerrainText != NULL);
639 llassert(mDrawDistanceMeterText1 != NULL);
640 llassert(mDrawDistanceMeterText2 != NULL);
641 llassert(mAvatarCountText != NULL); 636 llassert(mAvatarCountText != NULL);
642 637
643 // enable/disable the states 638 // enable/disable the states
@@ -684,16 +679,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
684 mAvatarText->setVisible(!isHidden); 679 mAvatarText->setVisible(!isHidden);
685 mLightingText->setVisible(!isHidden); 680 mLightingText->setVisible(!isHidden);
686 mTerrainText->setVisible(!isHidden); 681 mTerrainText->setVisible(!isHidden);
687 mDrawDistanceMeterText1->setVisible(!isHidden);
688 mDrawDistanceMeterText2->setVisible(!isHidden);
689 mAvatarCountText->setVisible(!isHidden); 682 mAvatarCountText->setVisible(!isHidden);
690 683
691 // hide one meter text if we're making things visible
692 if(!isHidden)
693 {
694 updateMeterText(mCtrlDrawDistance, this);
695 }
696
697 mMeshDetailText->setVisible(!isHidden); 684 mMeshDetailText->setVisible(!isHidden);
698 685
699 mCtrlAvatarMaxVisible->setVisible(!isHidden); 686 mCtrlAvatarMaxVisible->setVisible(!isHidden);
@@ -998,22 +985,6 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
998 } 985 }
999} 986}
1000 987
1001void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
1002{
1003 // get our UI widgets
1004 LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
1005 LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
1006
1007 LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
1008 LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
1009
1010 // toggle the two text boxes based on whether we have 1 or two digits
1011 F32 val = slider->getValueF32();
1012 bool two_digits = val < 100;
1013 m1->setVisible(two_digits);
1014 m2->setVisible(!two_digits);
1015}
1016
1017// static 988// static
1018void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data) 989void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data)
1019{ 990{
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index e92cd2f..d7727e7 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -128,8 +128,6 @@ protected:
128 LLTextBox *mAvatarText; 128 LLTextBox *mAvatarText;
129 LLTextBox *mTerrainText; 129 LLTextBox *mTerrainText;
130 LLTextBox *mLightingText; 130 LLTextBox *mLightingText;
131 LLTextBox *mDrawDistanceMeterText1;
132 LLTextBox *mDrawDistanceMeterText2;
133 131
134 LLTextBox *mMeshDetailText; 132 LLTextBox *mMeshDetailText;
135 LLTextBox *mLODFactorText; 133 LLTextBox *mLODFactorText;
@@ -194,7 +192,6 @@ protected:
194 static void onCommitWindowedMode(LLUICtrl* ctrl, void *data); 192 static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
195 static void onApplyResolution(LLUICtrl* ctrl, void* data); 193 static void onApplyResolution(LLUICtrl* ctrl, void* data);
196 static void updateSliderText(LLUICtrl* ctrl, void* user_data); 194 static void updateSliderText(LLUICtrl* ctrl, void* user_data);
197 static void updateMeterText(LLUICtrl* ctrl, void* user_data);
198 static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data); 195 static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data);
199 196
200 /// callback for defaults 197 /// callback for defaults
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index aa62b34..99bc4fd 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -116,15 +116,6 @@ BOOL LLPrefsAdvanced::postBuild()
116 116
117 initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck"); 117 initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck");
118 118
119 childSetValue("HighlightOwnNameInIM", gSavedSettings.getBOOL("HighlightOwnNameInIM"));
120 childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat"));
121 getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
122 childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
123 getChild<LLColorSwatchCtrl>("OwnNameChatColor")->set(gSavedSettings.getColor4("OwnNameChatColor"));
124 childSetValue("nick01", gSavedSettings.getString("nick01"));
125 childSetValue("nick02", gSavedSettings.getString("nick02"));
126 childSetValue("nick03", gSavedSettings.getString("nick03"));
127
128 refresh(); 119 refresh();
129 120
130 return TRUE; 121 return TRUE;
@@ -147,24 +138,6 @@ void LLPrefsAdvanced::apply()
147 gSavedSettings.setU32("LightShareAllowed", 138 gSavedSettings.setU32("LightShareAllowed",
148 (U32)childGetValue("lightshare_combo").asInteger()); 139 (U32)childGetValue("lightshare_combo").asInteger());
149 140
150 gSavedSettings.setBOOL("HighlightOwnNameInIM", childGetValue("HighlightOwnNameInIM"));
151 gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat"));
152 gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get());
153 gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));
154 gSavedSettings.setColor4("OwnNameChatColor", getChild<LLColorSwatchCtrl>("OwnNameChatColor")->get());
155
156 std::string nick01 = childGetValue("nick01");
157 boost::trim(nick01);
158 gSavedSettings.setString("nick01", nick01);
159
160 std::string nick02 = childGetValue("nick02");
161 boost::trim(nick02);
162 gSavedSettings.setString("nick02", nick02);
163
164 std::string nick03 = childGetValue("nick03");
165 boost::trim(nick03);
166 gSavedSettings.setString("nick03", nick03);
167
168 // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC 141 // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
169 if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check")) 142 if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
170 { 143 {
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 8d704d5..5f74a25 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -36,10 +36,8 @@
36#include "llchatbar.h" 36#include "llchatbar.h"
37#include "llfloaterchat.h" 37#include "llfloaterchat.h"
38#include "llprefschat.h" 38#include "llprefschat.h"
39#include "lltexteditor.h"
40#include "llviewercontrol.h" 39#include "llviewercontrol.h"
41#include "lluictrlfactory.h" 40#include "lluictrlfactory.h"
42#include "llcolorswatch.h"
43#include "llradiogroup.h" 41#include "llradiogroup.h"
44#include "llstylemap.h" 42#include "llstylemap.h"
45 43
@@ -57,15 +55,6 @@ private:
57 S32 mChatSize; 55 S32 mChatSize;
58 F32 mChatPersist; 56 F32 mChatPersist;
59 S32 mChatMaxLines; 57 S32 mChatMaxLines;
60 LLColor4 mSystemChatColor;
61 LLColor4 mUserChatColor;
62 LLColor4 mAgentChatColor;
63 LLColor4 mIMChatColor;
64 LLColor4 mObjectChatColor;
65 LLColor4 mOwnerSayChatColor;
66 LLColor4 mBGChatColor;
67 LLColor4 mScriptErrorColor;
68 LLColor4 mHTMLLinkColor;
69 BOOL mChatFullWidth; 58 BOOL mChatFullWidth;
70 BOOL mCloseChatOnReturn; 59 BOOL mCloseChatOnReturn;
71 BOOL mArrowKeysMoveAvatar; 60 BOOL mArrowKeysMoveAvatar;
@@ -92,16 +81,6 @@ LLPrefsChatImpl::LLPrefsChatImpl()
92 childSetValue("fade_chat_time", gSavedSettings.getF32("ChatPersistTime")); 81 childSetValue("fade_chat_time", gSavedSettings.getF32("ChatPersistTime"));
93 childSetValue("max_chat_count", gSavedSettings.getS32("ConsoleMaxLines")); 82 childSetValue("max_chat_count", gSavedSettings.getS32("ConsoleMaxLines"));
94 83
95 getChild<LLColorSwatchCtrl>("system")->set(gSavedSettings.getColor4("SystemChatColor"));
96 getChild<LLColorSwatchCtrl>("user")->set(gSavedSettings.getColor4("UserChatColor"));
97 getChild<LLColorSwatchCtrl>("agent")->set(gSavedSettings.getColor4("AgentChatColor"));
98 getChild<LLColorSwatchCtrl>("im")->set(gSavedSettings.getColor4("IMChatColor"));
99 getChild<LLColorSwatchCtrl>("script_error")->set(gSavedSettings.getColor4("ScriptErrorColor"));
100 getChild<LLColorSwatchCtrl>("objects")->set(gSavedSettings.getColor4("ObjectChatColor"));
101 getChild<LLColorSwatchCtrl>("owner")->set(gSavedSettings.getColor4("llOwnerSayChatColor"));
102 getChild<LLColorSwatchCtrl>("background")->set(gSavedSettings.getColor4("BackgroundChatColor"));
103 getChild<LLColorSwatchCtrl>("links")->set(gSavedSettings.getColor4("HTMLLinkColor"));
104
105 childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar")); 84 childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar"));
106 childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ChatShowTimestamps")); 85 childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ChatShowTimestamps"));
107 childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat")); 86 childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
@@ -124,15 +103,6 @@ void LLPrefsChatImpl::refreshValues()
124 mChatSize = gSavedSettings.getS32("ChatFontSize"); 103 mChatSize = gSavedSettings.getS32("ChatFontSize");
125 mChatPersist = gSavedSettings.getF32("ChatPersistTime"); 104 mChatPersist = gSavedSettings.getF32("ChatPersistTime");
126 mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines"); 105 mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines");
127 mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
128 mUserChatColor = gSavedSettings.getColor4("UserChatColor");
129 mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
130 mIMChatColor = gSavedSettings.getColor4("IMChatColor");
131 mObjectChatColor = gSavedSettings.getColor4("ObjectChatColor");
132 mOwnerSayChatColor = gSavedSettings.getColor4("llOwnerSayChatColor");
133 mBGChatColor = gSavedSettings.getColor4("BackgroundChatColor");
134 mScriptErrorColor = gSavedSettings.getColor4("ScriptErrorColor");
135 mHTMLLinkColor = gSavedSettings.getColor4("HTMLLinkColor");
136 mArrowKeysMoveAvatar = gSavedSettings.getBOOL("ArrowKeysMoveAvatar"); 106 mArrowKeysMoveAvatar = gSavedSettings.getBOOL("ArrowKeysMoveAvatar");
137 mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps"); 107 mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps");
138 mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat"); 108 mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat");
@@ -154,15 +124,6 @@ void LLPrefsChatImpl::cancel()
154 gSavedSettings.setS32("ChatFontSize", mChatSize); 124 gSavedSettings.setS32("ChatFontSize", mChatSize);
155 gSavedSettings.setF32("ChatPersistTime", mChatPersist); 125 gSavedSettings.setF32("ChatPersistTime", mChatPersist);
156 gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines); 126 gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines);
157 gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
158 gSavedSettings.setColor4("UserChatColor", mUserChatColor);
159 gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
160 gSavedSettings.setColor4("IMChatColor", mIMChatColor);
161 gSavedSettings.setColor4("ObjectChatColor", mObjectChatColor);
162 gSavedSettings.setColor4("llOwnerSayChatColor", mOwnerSayChatColor);
163 gSavedSettings.setColor4("BackgroundChatColor", mBGChatColor);
164 gSavedSettings.setColor4("ScriptErrorColor", mScriptErrorColor);
165 gSavedSettings.setColor4("HTMLLinkColor", mHTMLLinkColor);
166 gSavedSettings.setBOOL("ArrowKeysMoveAvatar", mArrowKeysMoveAvatar); 127 gSavedSettings.setBOOL("ArrowKeysMoveAvatar", mArrowKeysMoveAvatar);
167 gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps); 128 gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps);
168 gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat); 129 gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat);
@@ -184,18 +145,6 @@ void LLPrefsChatImpl::apply()
184 gSavedSettings.setF32("ChatPersistTime", childGetValue("fade_chat_time").asReal()); 145 gSavedSettings.setF32("ChatPersistTime", childGetValue("fade_chat_time").asReal());
185 gSavedSettings.setS32("ConsoleMaxLines", childGetValue("max_chat_count")); 146 gSavedSettings.setS32("ConsoleMaxLines", childGetValue("max_chat_count"));
186 147
187 gSavedSettings.setColor4("SystemChatColor", childGetValue("system"));
188 gSavedSettings.setColor4("UserChatColor", childGetValue("user"));
189 gSavedSettings.setColor4("AgentChatColor", childGetValue("agent"));
190 gSavedSettings.setColor4("IMChatColor", childGetValue("im"));
191 gSavedSettings.setColor4("ScriptErrorColor", childGetValue("script_error"));
192 gSavedSettings.setColor4("ObjectChatColor", childGetValue("objects"));
193 gSavedSettings.setColor4("llOwnerSayChatColor", childGetValue("owner"));
194 gSavedSettings.setColor4("BackgroundChatColor", childGetValue("background"));
195
196 gSavedSettings.setColor4("HTMLLinkColor", childGetValue("links"));
197 LLTextEditor::setLinkColor(childGetValue("links"));
198
199 gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check")); 148 gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check"));
200 gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check")); 149 gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check"));
201 gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat")); 150 gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
new file mode 100644
index 0000000..36e98a4
--- /dev/null
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -0,0 +1,180 @@
1/**
2* @file llprefscolors.cpp
3* @brief Color-specific preferences for Imprudence
4*
5* $LicenseInfo:firstyear=2009&license=viewergpl$
6*
7* Copyright (c) 2010, McCabe Maxsted
8*
9* Imprudence Viewer Source Code
10* The source code in this file ("Source Code") is provided to you
11* under the terms of the GNU General Public License, version 2.0
12* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
13* this distribution, or online at
14* http://secondlifegrid.net/programs/open_source/licensing/gplv2
15*
16* There are special exceptions to the terms and conditions of the GPL as
17* it is applied to this Source Code. View the full text of the exception
18* in the file doc/FLOSS-exception.txt in this software distribution, or
19* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
20*
21* By copying, modifying or distributing this software, you acknowledge
22* that you have read and understood your obligations described above,
23* and agree to abide by those obligations.
24*
25* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
26* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27* COMPLETENESS OR PERFORMANCE.
28* $/LicenseInfo$
29*/
30
31#include "llviewerprecompiledheaders.h"
32
33#include "llprefscolors.h"
34#include "lltexteditor.h"
35#include "llviewercontrol.h"
36
37#include "lluictrlfactory.h"
38#include "llcolorswatch.h"
39
40#include "boost/algorithm/string.hpp"
41
42LLPrefsColors::LLPrefsColors()
43{
44 refreshColors(); // initialize member data from saved settings
45
46 LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_colors.xml");
47}
48
49LLPrefsColors::~LLPrefsColors()
50{
51 // Children all cleaned up by default view destructor.
52}
53
54BOOL LLPrefsColors::postBuild()
55{
56 getChild<LLColorSwatchCtrl>("system")->set(gSavedSettings.getColor4("SystemChatColor"));
57 getChild<LLColorSwatchCtrl>("user")->set(gSavedSettings.getColor4("UserChatColor"));
58 getChild<LLColorSwatchCtrl>("agent")->set(gSavedSettings.getColor4("AgentChatColor"));
59 getChild<LLColorSwatchCtrl>("im")->set(gSavedSettings.getColor4("IMChatColor"));
60 getChild<LLColorSwatchCtrl>("script_error")->set(gSavedSettings.getColor4("ScriptErrorColor"));
61 getChild<LLColorSwatchCtrl>("objects")->set(gSavedSettings.getColor4("ObjectChatColor"));
62 getChild<LLColorSwatchCtrl>("owner")->set(gSavedSettings.getColor4("llOwnerSayChatColor"));
63 getChild<LLColorSwatchCtrl>("background")->set(gSavedSettings.getColor4("BackgroundChatColor"));
64 getChild<LLColorSwatchCtrl>("links")->set(gSavedSettings.getColor4("HTMLLinkColor"));
65 getChild<LLColorSwatchCtrl>("FriendsChatColor")->set(gSavedSettings.getColor4("FriendsChatColor"));
66 getChild<LLColorSwatchCtrl>("OwnNameChatColor")->set(gSavedSettings.getColor4("OwnNameChatColor"));
67
68 childSetValue("HighlightOwnNameInIM", gSavedSettings.getBOOL("HighlightOwnNameInIM"));
69 childSetValue("HighlightFriendsChat", gSavedSettings.getBOOL("HighlightFriendsChat"));
70 childSetValue("HighlightOwnNameInChat", gSavedSettings.getBOOL("HighlightOwnNameInChat"));
71 updateSelfCheck();
72 updateFriendsCheck();
73
74 childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
75 childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
76 childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));
77
78 childSetCommitCallback("HighlightOwnNameInIM", onCommitCheckSelfName, this);
79 childSetCommitCallback("HighlightOwnNameInChat", onCommitCheckSelfName, this);
80 childSetCommitCallback("HighlightFriendsChat", onCommitCheckFriends, this);
81
82 return TRUE;
83}
84
85void LLPrefsColors::refreshColors()
86{
87 mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
88 mUserChatColor = gSavedSettings.getColor4("UserChatColor");
89 mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
90 mIMChatColor = gSavedSettings.getColor4("IMChatColor");
91 mObjectChatColor = gSavedSettings.getColor4("ObjectChatColor");
92 mOwnerSayChatColor = gSavedSettings.getColor4("llOwnerSayChatColor");
93 mBGChatColor = gSavedSettings.getColor4("BackgroundChatColor");
94 mScriptErrorColor = gSavedSettings.getColor4("ScriptErrorColor");
95 mHTMLLinkColor = gSavedSettings.getColor4("HTMLLinkColor");
96 mFriendsChatColor = gSavedSettings.getColor4("FriendsChatColor");
97 mOwnNameChatColor = gSavedSettings.getColor4("OwnNameChatColor");
98}
99
100// static
101void LLPrefsColors::onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata)
102{
103 LLPrefsColors* self = (LLPrefsColors*)userdata;
104 self->updateSelfCheck();
105}
106
107void LLPrefsColors::updateSelfCheck()
108{
109 bool highlight_names_enabled = (childGetValue("HighlightOwnNameInIM") || childGetValue("HighlightOwnNameInChat"));
110
111 getChild<LLColorSwatchCtrl>("OwnNameChatColor")->setEnabled(highlight_names_enabled);
112 childSetEnabled("nick01", highlight_names_enabled);
113 childSetEnabled("nick02", highlight_names_enabled);
114 childSetEnabled("nick03", highlight_names_enabled);
115 childSetEnabled("nick01_text", highlight_names_enabled);
116 childSetEnabled("nick02_text", highlight_names_enabled);
117 childSetEnabled("nick03_text", highlight_names_enabled);
118}
119
120// static
121void LLPrefsColors::onCommitCheckFriends(LLUICtrl* ctrl, void* userdata)
122{
123 LLPrefsColors* self = (LLPrefsColors*)userdata;
124 self->updateFriendsCheck();
125}
126
127void LLPrefsColors::updateFriendsCheck()
128{
129 getChild<LLColorSwatchCtrl>("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat"));
130}
131
132void LLPrefsColors::cancel()
133{
134 gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
135 gSavedSettings.setColor4("UserChatColor", mUserChatColor);
136 gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
137 gSavedSettings.setColor4("IMChatColor", mIMChatColor);
138 gSavedSettings.setColor4("ObjectChatColor", mObjectChatColor);
139 gSavedSettings.setColor4("llOwnerSayChatColor", mOwnerSayChatColor);
140 gSavedSettings.setColor4("BackgroundChatColor", mBGChatColor);
141 gSavedSettings.setColor4("ScriptErrorColor", mScriptErrorColor);
142 gSavedSettings.setColor4("HTMLLinkColor", mHTMLLinkColor);
143 gSavedSettings.setColor4("FriendsChatColor", mFriendsChatColor);
144 gSavedSettings.setColor4("OwnNameChatColor", mOwnNameChatColor);
145}
146
147void LLPrefsColors::apply()
148{
149 gSavedSettings.setColor4("SystemChatColor", childGetValue("system"));
150 gSavedSettings.setColor4("UserChatColor", childGetValue("user"));
151 gSavedSettings.setColor4("AgentChatColor", childGetValue("agent"));
152 gSavedSettings.setColor4("IMChatColor", childGetValue("im"));
153 gSavedSettings.setColor4("ScriptErrorColor", childGetValue("script_error"));
154 gSavedSettings.setColor4("ObjectChatColor", childGetValue("objects"));
155 gSavedSettings.setColor4("llOwnerSayChatColor", childGetValue("owner"));
156 gSavedSettings.setColor4("BackgroundChatColor", childGetValue("background"));
157
158 gSavedSettings.setColor4("HTMLLinkColor", childGetValue("links"));
159 LLTextEditor::setLinkColor(childGetValue("links"));
160
161 gSavedSettings.setBOOL("HighlightOwnNameInIM", childGetValue("HighlightOwnNameInIM"));
162 gSavedSettings.setBOOL("HighlightFriendsChat", childGetValue("HighlightFriendsChat"));
163 gSavedSettings.setColor4("FriendsChatColor", getChild<LLColorSwatchCtrl>("FriendsChatColor")->get());
164 gSavedSettings.setBOOL("HighlightOwnNameInChat", childGetValue("HighlightOwnNameInChat"));
165 gSavedSettings.setColor4("OwnNameChatColor", getChild<LLColorSwatchCtrl>("OwnNameChatColor")->get());
166
167 std::string nick01 = childGetValue("nick01");
168 boost::trim(nick01);
169 gSavedSettings.setString("HighlightNickname01", nick01);
170
171 std::string nick02 = childGetValue("nick02");
172 boost::trim(nick02);
173 gSavedSettings.setString("HighlightNickname02", nick02);
174
175 std::string nick03 = childGetValue("nick03");
176 boost::trim(nick03);
177 gSavedSettings.setString("HighlightNickname03", nick03);
178
179 refreshColors(); // member values become the official values and cancel becomes a no-op.
180}
diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h
new file mode 100644
index 0000000..70bda89
--- /dev/null
+++ b/linden/indra/newview/llprefscolors.h
@@ -0,0 +1,67 @@
1/**
2* @file llprefscolors.h
3* @brief Advanced preferences options for Imprudence
4*
5* $LicenseInfo:firstyear=2009&license=viewergpl$
6*
7* Copyright (c) 2010, McCabe Maxsted
8*
9* Imprudence Viewer Source Code
10* The source code in this file ("Source Code") is provided to you
11* under the terms of the GNU General Public License, version 2.0
12* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
13* this distribution, or online at
14* http://secondlifegrid.net/programs/open_source/licensing/gplv2
15*
16* There are special exceptions to the terms and conditions of the GPL as
17* it is applied to this Source Code. View the full text of the exception
18* in the file doc/FLOSS-exception.txt in this software distribution, or
19* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
20*
21* By copying, modifying or distributing this software, you acknowledge
22* that you have read and understood your obligations described above,
23* and agree to abide by those obligations.
24*
25* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
26* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27* COMPLETENESS OR PERFORMANCE.
28* $/LicenseInfo$
29*/
30
31#ifndef LLPREFSCOLORS_H
32#define LLPREFSCOLORS_H
33
34#include "llpanel.h"
35
36class LLPrefsColors : public LLPanel
37{
38public:
39 LLPrefsColors();
40 ~LLPrefsColors();
41
42 BOOL postBuild();
43
44 void apply();
45 void cancel();
46
47private:
48 static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata);
49 static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata);
50 void refreshColors();
51 void updateFriendsCheck();
52 void updateSelfCheck();
53
54 LLColor4 mSystemChatColor;
55 LLColor4 mUserChatColor;
56 LLColor4 mAgentChatColor;
57 LLColor4 mIMChatColor;
58 LLColor4 mObjectChatColor;
59 LLColor4 mOwnerSayChatColor;
60 LLColor4 mBGChatColor;
61 LLColor4 mScriptErrorColor;
62 LLColor4 mHTMLLinkColor;
63 LLColor4 mFriendsChatColor;
64 LLColor4 mOwnNameChatColor;
65};
66
67#endif //LLPREFSCOLORS_H
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 0d53e82..b0a6834 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -85,6 +85,8 @@
85#include "llviewerregion.h" 85#include "llviewerregion.h"
86#include "llviewerstats.h" 86#include "llviewerstats.h"
87#include "llvoavatar.h" 87#include "llvoavatar.h"
88#include "llvograss.h"
89#include "llvotree.h"
88#include "llvovolume.h" 90#include "llvovolume.h"
89#include "pipeline.h" 91#include "pipeline.h"
90 92
@@ -832,7 +834,10 @@ void LLSelectMgr::highlightObjectOnly(LLViewerObject* objectp)
832 return; 834 return;
833 } 835 }
834 836
835 if (objectp->getPCode() != LL_PCODE_VOLUME) 837 if ((objectp->getPCode() != LL_PCODE_VOLUME) &&
838 (objectp->getPCode() != LL_PCODE_LEGACY_TREE) &&
839 (objectp->getPCode() != LL_PCODE_LEGACY_GRASS))
840
836 { 841 {
837 return; 842 return;
838 } 843 }
@@ -880,7 +885,10 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
880 { 885 {
881 continue; 886 continue;
882 } 887 }
883 if (object->getPCode() != LL_PCODE_VOLUME) 888
889 if ((object->getPCode() != LL_PCODE_VOLUME) &&
890 (object->getPCode() != LL_PCODE_LEGACY_TREE) &&
891 (object->getPCode() != LL_PCODE_LEGACY_GRASS))
884 { 892 {
885 continue; 893 continue;
886 } 894 }
@@ -900,7 +908,14 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
900 908
901void LLSelectMgr::unhighlightObjectOnly(LLViewerObject* objectp) 909void LLSelectMgr::unhighlightObjectOnly(LLViewerObject* objectp)
902{ 910{
903 if (!objectp || (objectp->getPCode() != LL_PCODE_VOLUME)) 911 if (!objectp)
912 {
913 return;
914 }
915
916 if ((objectp->getPCode() != LL_PCODE_VOLUME) &&
917 (objectp->getPCode() != LL_PCODE_LEGACY_TREE) &&
918 (objectp->getPCode() != LL_PCODE_LEGACY_GRASS))
904 { 919 {
905 return; 920 return;
906 } 921 }
@@ -5020,6 +5035,14 @@ void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_
5020 { 5035 {
5021 ((LLVOVolume*)objectp)->generateSilhouette(nodep, view_point); 5036 ((LLVOVolume*)objectp)->generateSilhouette(nodep, view_point);
5022 } 5037 }
5038 else if (objectp && objectp->getPCode() == LL_PCODE_LEGACY_GRASS)
5039 {
5040 ((LLVOGrass*)objectp)->generateSilhouette(nodep, view_point);
5041 }
5042 else if (objectp && objectp->getPCode() == LL_PCODE_LEGACY_TREE)
5043 {
5044 ((LLVOTree*)objectp)->generateSilhouette(nodep, view_point);
5045 }
5023} 5046}
5024 5047
5025// 5048//
@@ -5355,8 +5378,10 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
5355 glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix); 5378 glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix);
5356 } 5379 }
5357 5380
5358 LLVolume *volume = objectp->getVolume(); 5381 //LLVolume *volume = objectp->getVolume();
5359 if (volume) 5382 //if (volume)
5383 // we used to only call this for volumes. but let's render silhouettes for any node that has them.
5384 if (1)
5360 { 5385 {
5361 F32 silhouette_thickness; 5386 F32 silhouette_thickness;
5362 if (is_hud_object && gAgent.getAvatarObject()) 5387 if (is_hud_object && gAgent.getAvatarObject())
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index dade65f..16f6e57 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -743,7 +743,9 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
743 LLVolume* volume = volumep->getVolume(); 743 LLVolume* volume = volumep->getVolume();
744 if (!volume) 744 if (!volume)
745 { 745 {
746 return FALSE; 746 BOOL inside = pointInFrustum(volumep->getRenderPosition());
747
748 return (inside > 0);
747 } 749 }
748 750
749 LLVOVolume* vo_volume = (LLVOVolume*) volumep; 751 LLVOVolume* vo_volume = (LLVOVolume*) volumep;
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index f738872..913ec33 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -48,6 +48,7 @@
48#include "llviewercamera.h" 48#include "llviewercamera.h"
49#include "llviewerimagelist.h" 49#include "llviewerimagelist.h"
50#include "llviewerregion.h" 50#include "llviewerregion.h"
51#include "llselectmgr.h"
51#include "pipeline.h" 52#include "pipeline.h"
52#include "llspatialpartition.h" 53#include "llspatialpartition.h"
53#include "llworld.h" 54#include "llworld.h"
@@ -721,3 +722,93 @@ BOOL LLVOGrass::lineSegmentIntersect(const LLVector3& start, const LLVector3& en
721 return ret; 722 return ret;
722} 723}
723 724
725void LLVOGrass::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
726 std::vector<LLVector3> &normals,
727 std::vector<S32> &segments,
728 const LLVector3& obj_cam_vec,
729 const LLMatrix4& mat,
730 const LLMatrix3& norm_mat)
731{
732 vertices.clear();
733 normals.clear();
734 segments.clear();
735
736 F32 width = sSpeciesTable[mSpecies]->mBladeSizeX;
737 F32 height = sSpeciesTable[mSpecies]->mBladeSizeY;
738
739 for (S32 i = 0; i < mNumBlades; i++)
740 {
741 F32 x = exp_x[i] * mScale.mV[VX];
742 F32 y = exp_y[i] * mScale.mV[VY];
743 F32 xf = rot_x[i] * GRASS_BLADE_BASE * width * w_mod[i];
744 F32 yf = rot_y[i] * GRASS_BLADE_BASE * width * w_mod[i];
745 F32 dzx = dz_x [i];
746 F32 dzy = dz_y [i];
747
748 F32 blade_height= GRASS_BLADE_HEIGHT * height * w_mod[i];
749
750 LLVector3 position1;
751
752 position1.mV[0] = mPosition.mV[VX] + x + xf;
753 position1.mV[1] = mPosition.mV[VY] + y + yf;
754 position1.mV[2] = mRegionp->getLand().resolveHeightRegion(position1);
755
756 LLVector3 position2 = position1;
757
758 position2.mV[0] += dzx;
759 position2.mV[1] += dzy;
760 position2.mV[2] += blade_height;
761
762 LLVector3 position3;
763
764 position3.mV[0] = mPosition.mV[VX] + x - xf;
765 position3.mV[1] = mPosition.mV[VY] + y - xf;
766 position3.mV[2] = mRegionp->getLand().resolveHeightRegion(position3);
767
768 LLVector3 position4 = position3;
769
770 position4.mV[0] += dzx;
771 position4.mV[1] += dzy;
772 position4.mV[2] += blade_height;
773
774
775 LLVector3 normal = (position1-position2) % (position2 - position3);
776 normal.normalize();
777
778 vertices.push_back(position1 + mRegionp->getOriginAgent());
779 normals.push_back(normal);
780 vertices.push_back(position2 + mRegionp->getOriginAgent());
781 normals.push_back(normal);
782 segments.push_back(vertices.size());
783
784 vertices.push_back(position2 + mRegionp->getOriginAgent());
785 normals.push_back(normal);
786 vertices.push_back(position4 + mRegionp->getOriginAgent());
787 normals.push_back(normal);
788 segments.push_back(vertices.size());
789
790 vertices.push_back(position4 + mRegionp->getOriginAgent());
791 normals.push_back(normal);
792 vertices.push_back(position3 + mRegionp->getOriginAgent());
793 normals.push_back(normal);
794 segments.push_back(vertices.size());
795
796 vertices.push_back(position3 + mRegionp->getOriginAgent());
797 normals.push_back(normal);
798 vertices.push_back(position1 + mRegionp->getOriginAgent());
799 normals.push_back(normal);
800 segments.push_back(vertices.size());
801 }
802}
803
804
805
806void LLVOGrass::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
807{
808 generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals,
809 nodep->mSilhouetteSegments,
810 LLVector3(0,0,0), LLMatrix4(), LLMatrix3());
811
812 nodep->mSilhouetteExists = TRUE;
813
814}
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 25fa04c..c76ab93 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -37,6 +37,7 @@
37#include "lldarray.h" 37#include "lldarray.h"
38#include <map> 38#include <map>
39 39
40class LLSelectNode;
40class LLSurfacePatch; 41class LLSurfacePatch;
41class LLViewerImage; 42class LLViewerImage;
42 43
@@ -76,6 +77,8 @@ public:
76 /*virtual*/ BOOL updateLOD(); 77 /*virtual*/ BOOL updateLOD();
77 /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area 78 /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
78 79
80 void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
81
79 void plantBlades(); 82 void plantBlades();
80 83
81 /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. 84 /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
@@ -125,6 +128,12 @@ protected:
125 ~LLVOGrass(); 128 ~LLVOGrass();
126 129
127private: 130private:
131 void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
132 std::vector<LLVector3> &normals,
133 std::vector<S32> &segments,
134 const LLVector3& view_vec,
135 const LLMatrix4& mat,
136 const LLMatrix3& norm_mat);
128 void updateSpecies(); 137 void updateSpecies();
129 F32 mLastHeight; // For cheap update hack 138 F32 mLastHeight; // For cheap update hack
130 S32 mNumBlades; 139 S32 mNumBlades;
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 6a59253..8c6abdc 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -47,6 +47,7 @@
47#include "llagent.h" 47#include "llagent.h"
48#include "lldrawable.h" 48#include "lldrawable.h"
49#include "llface.h" 49#include "llface.h"
50#include "llselectmgr.h"
50#include "llviewercamera.h" 51#include "llviewercamera.h"
51#include "llviewerimagelist.h" 52#include "llviewerimagelist.h"
52#include "llviewerobjectlist.h" 53#include "llviewerobjectlist.h"
@@ -1327,3 +1328,127 @@ LLTreePartition::LLTreePartition()
1327 mLODPeriod = 1; 1328 mLODPeriod = 1;
1328} 1329}
1329 1330
1331
1332
1333void LLVOTree::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
1334 std::vector<LLVector3> &normals,
1335 std::vector<S32> &segments,
1336 const LLVector3& obj_cam_vec,
1337 const LLMatrix4& local_matrix,
1338 const LLMatrix3& normal_matrix)
1339{
1340 vertices.clear();
1341 normals.clear();
1342 segments.clear();
1343
1344 F32 height = mBillboardScale; // *mBillboardRatio * 0.5;
1345 F32 width = height * mTrunkAspect;
1346
1347 LLVector3 position1 = LLVector3(-width * 0.5,0,0) * local_matrix;
1348 LLVector3 position2 = LLVector3(-width * 0.5,0,height) * local_matrix;
1349 LLVector3 position3 = LLVector3(+width * 0.5,0,height) * local_matrix;
1350 LLVector3 position4 = LLVector3(+width * 0.5,0,0) * local_matrix;
1351
1352 LLVector3 position5 = LLVector3(0,-width * 0.5,0) * local_matrix;
1353 LLVector3 position6 = LLVector3(0,-width * 0.5,height) * local_matrix;
1354 LLVector3 position7 = LLVector3(0,+width * 0.5,height) * local_matrix;
1355 LLVector3 position8 = LLVector3(0,+width * 0.5,0) * local_matrix;
1356
1357
1358 LLVector3 normal = (position1-position2) % (position2-position3);
1359 normal.normalize();
1360
1361 vertices.push_back(position1);
1362 normals.push_back(normal);
1363 vertices.push_back(position2);
1364 normals.push_back(normal);
1365 segments.push_back(vertices.size());
1366
1367 vertices.push_back(position2);
1368 normals.push_back(normal);
1369 vertices.push_back(position3);
1370 normals.push_back(normal);
1371 segments.push_back(vertices.size());
1372
1373 vertices.push_back(position3);
1374 normals.push_back(normal);
1375 vertices.push_back(position4);
1376 normals.push_back(normal);
1377 segments.push_back(vertices.size());
1378
1379 vertices.push_back(position4);
1380 normals.push_back(normal);
1381 vertices.push_back(position1);
1382 normals.push_back(normal);
1383 segments.push_back(vertices.size());
1384
1385 normal = (position5-position6) % (position6-position7);
1386 normal.normalize();
1387
1388 vertices.push_back(position5);
1389 normals.push_back(normal);
1390 vertices.push_back(position6);
1391 normals.push_back(normal);
1392 segments.push_back(vertices.size());
1393
1394 vertices.push_back(position6);
1395 normals.push_back(normal);
1396 vertices.push_back(position7);
1397 normals.push_back(normal);
1398 segments.push_back(vertices.size());
1399
1400 vertices.push_back(position7);
1401 normals.push_back(normal);
1402 vertices.push_back(position8);
1403 normals.push_back(normal);
1404 segments.push_back(vertices.size());
1405
1406 vertices.push_back(position8);
1407 normals.push_back(normal);
1408 vertices.push_back(position5);
1409 normals.push_back(normal);
1410 segments.push_back(vertices.size());
1411
1412}
1413
1414
1415void LLVOTree::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
1416{
1417 LLVector3 position;
1418 LLQuaternion rotation;
1419
1420 if (mDrawable->isActive())
1421 {
1422 if (mDrawable->isSpatialRoot())
1423 {
1424 position = LLVector3();
1425 rotation = LLQuaternion();
1426 }
1427 else
1428 {
1429 position = mDrawable->getPosition();
1430 rotation = mDrawable->getRotation();
1431 }
1432 }
1433 else
1434 {
1435 position = getPosition() + getRegion()->getOriginAgent();;
1436 rotation = getRotation();
1437 }
1438
1439 // trees have bizzare scaling rules... because it's cool to make needless exceptions
1440 // PS: the trees are the last remaining tidbit of Philip's code. take a look sometime.
1441 F32 radius = getScale().length() * 0.05f;
1442 LLVector3 scale = LLVector3(1,1,1) * radius;
1443
1444 // compose final matrix
1445 LLMatrix4 local_matrix;
1446 local_matrix.initAll(scale, rotation, position);
1447
1448
1449 generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals,
1450 nodep->mSilhouetteSegments,
1451 LLVector3(0,0,0), local_matrix, LLMatrix3());
1452
1453 nodep->mSilhouetteExists = TRUE;
1454}
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 855c612..57116cc 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,7 +39,7 @@
39 39
40class LLFace; 40class LLFace;
41class LLDrawPool; 41class LLDrawPool;
42 42class LLSelectNode;
43 43
44class LLVOTree : public LLViewerObject 44class LLVOTree : public LLViewerObject
45{ 45{
@@ -124,6 +124,9 @@ public:
124 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point 124 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point
125 ); 125 );
126 126
127 void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
128
129
127 static S32 sMaxTreeSpecies; 130 static S32 sMaxTreeSpecies;
128 131
129 struct TreeSpeciesData 132 struct TreeSpeciesData
@@ -200,6 +203,15 @@ protected:
200 static S32 sLODVertexCount[4]; 203 static S32 sLODVertexCount[4];
201 static S32 sLODSlices[4]; 204 static S32 sLODSlices[4];
202 static F32 sLODAngles[4]; 205 static F32 sLODAngles[4];
206
207private:
208 void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
209 std::vector<LLVector3> &normals,
210 std::vector<S32> &segments,
211 const LLVector3& view_vec,
212 const LLMatrix4& mat,
213 const LLMatrix3& norm_mat);
214
203}; 215};
204 216
205#endif 217#endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 5b42e9f..939a877 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -16,9 +16,9 @@
16 width="90" /> 16 width="90" />
17 <button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif" 17 <button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
18 halign="center" height="20" 18 halign="center" height="20"
19 help_url="http://secondlife.com/app/help/technical/preferences.php" 19 help_url="http://support.imprudenceviewer.org/"
20 label="Help" label_selected="Help" left="9" mouse_opaque="true" 20 label="Support" left="9" mouse_opaque="true"
21 name="Help" scale_image="true" width="90" /> 21 name="Support" scale_image="true" width="100" />
22 <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455" 22 <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455"
23 left="0" mouse_opaque="false" name="pref core" tab_group="1" 23 left="0" mouse_opaque="false" name="pref core" tab_group="1"
24 tab_position="left" tab_width="120" width="620" /> 24 tab_position="left" tab_width="120" width="620" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 0f2181b..1b771b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -179,57 +179,6 @@ To use spellcheck, right-click a misspelled word
179 tool_tip="Modify the AutoCorrect word list and settings" left="12" 179 tool_tip="Modify the AutoCorrect word list and settings" left="12"
180 bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/> 180 bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
181 </panel> 181 </panel>
182
183 <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Extra"
184 left="1" mouse_opaque="true" name="Extra" width="418">
185
186 <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
187 initial_value="true" label="Show chat messages from friends in a different color" left="12"
188 mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
189
190 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
191 can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
192 enabled="true" follows="left|top" height="67" label="Friends" left_delta="68"
193 mouse_opaque="true" name="FriendsChatColor" width="65" />
194
195 <check_box bottom_delta="-30" enabled="true" follows="left|top"
196 font="SansSerifSmall" height="16" initial_value="true"
197 label="Show chat messages containing your name in a different color" left="12" mouse_opaque="true"
198 name="HighlightOwnNameInChat" radio_style="false" width="217" />
199
200 <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
201 initial_value="true" label="Show GroupIM messages containing your name in a different color" left="12"
202 mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
203
204 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
205 can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
206 enabled="true" follows="left|top" height="67" label="Own Name" left_delta="68"
207 mouse_opaque="true" name="OwnNameChatColor" width="65" />
208
209 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-50"
210 enabled="true" follows="left|top" font="SansSerif"
211 handle_edit_keys_directly="true" height="20" left_delta="0"
212 max_length="50" mouse_opaque="true" name="nick01"
213 select_all_on_focus_received="true" width="400" word_wrap="false" />
214 182
215 <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick01_text" width="70">Nick 1</text>
216
217 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
218 enabled="true" follows="left|top" font="SansSerif"
219 handle_edit_keys_directly="true" height="20" left_delta="60"
220 max_length="50" mouse_opaque="true" name="nick02"
221 select_all_on_focus_received="true" width="400" word_wrap="false" />
222
223 <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick02_text" width="70">Nick 2</text>
224
225 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-30"
226 enabled="true" follows="left|top" font="SansSerif"
227 handle_edit_keys_directly="true" height="20" left_delta="60"
228 max_length="50" mouse_opaque="true" name="nick03"
229 select_all_on_focus_received="true" width="400" word_wrap="false" />
230
231 <text bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="20" left="20" name="nick03_text" width="70">Nick 3</text>
232
233 </panel>
234 </tab_container> 183 </tab_container>
235</panel> 184</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index fe60203..9ead3bf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" 2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="Text Chat" left="102" mouse_opaque="true" name="chat" 3 height="408" label="Chat" left="102" mouse_opaque="true" name="chat"
4 width="517"> 4 width="517">
5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 6 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -24,60 +24,84 @@
24 Large 24 Large
25 </radio_item> 25 </radio_item>
26 </radio_group> 26 </radio_group>
27
28 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
29 bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
30 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
31 mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
32 Translate Chat:
33 </text>
34 <check_box bottom_delta="-3" control_name="TranslateChat" enabled="true" follows="left|top"
35 font="SansSerifSmall" height="16" initial_value="false"
36 label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
37 name="translate_chat" radio_style="false" width="237" />
38 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
39 bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
40 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
41 mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
42 Translate into this language:
43 </text>
44 <combo_box allow_text_entry="true" bottom_delta="-5" enabled="true"
45 follows="left|top" height="16" left_delta="183" max_chars="135"
46 mouse_opaque="true" name="translate_language_combobox" width="146">
47 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
48 System Default
49 </combo_item>
50 <combo_item type="string" length="1" enabled="true" name="English" value="en">
51 English
52 </combo_item>
53
54 <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
55
56 <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
57 Dansk (Danish)
58 </combo_item>
59 <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
60 Deutsch (German)
61 </combo_item>
62 <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
63 Español (Spanish)
64 </combo_item>
65 <combo_item type="string" length="1" enabled="true" name="French" value="fr">
66 Français (French)
67 </combo_item>
68 <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
69 Italiano (Italian)
70 </combo_item>
71 <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
72 Magyar (Hungarian)
73 </combo_item>
74 <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
75 Nederlands (Dutch)
76 </combo_item>
77 <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
78 Polski (Polish)
79 </combo_item>
80 <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
81 Portugués (Portuguese)
82 </combo_item>
83 <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
84 Русский (Russian)
85 </combo_item>
86 <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
87 Türkçe (Turkish)
88 </combo_item>
89 <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
90 Українська (Ukrainian)
91 </combo_item>
92 <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
93 中文 (简体) (Chinese)
94 </combo_item>
95 <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
96 日本語 (Japanese)
97 </combo_item>
98 <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
99 한국어 (Korean)
100 </combo_item>
101 </combo_box>
102
27 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 103 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
28 bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top" 104 bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
29 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
30 mouse_opaque="false" name="text_box2" v_pad="0" width="128">
31 Color:
32 </text>
33 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
34 can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
35 enabled="true" follows="left|top" height="56" label="You" left="148"
36 mouse_opaque="true" name="user" width="54" />
37 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
38 can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
39 enabled="true" follows="left|top" height="56" label="Others" left_delta="68"
40 mouse_opaque="true" name="agent" width="54" />
41 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
42 can_apply_immediately="true" color="0.6 0.6 1 1"
43 enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
44 mouse_opaque="true" name="im" width="54" />
45 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
46 can_apply_immediately="true" color="0.8 1 1 1"
47 enabled="true" follows="left|top"
48 height="56" label="System" left_delta="68" mouse_opaque="true"
49 name="system" width="54" />
50 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
51 can_apply_immediately="true" color="0.82 0.82 0.99 1"
52 control_name="ScriptErrorColor" enabled="true" follows="left|top"
53 height="56" label="Errors" left_delta="68" mouse_opaque="true"
54 name="script_error" width="54" />
55 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
56 can_apply_immediately="true" color="0.7 0.9 0.7 1"
57 control_name="ObjectChatColor" enabled="true" follows="left|top"
58 height="56" label="Objects" left="148" mouse_opaque="true"
59 name="objects" width="54" />
60 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
61 can_apply_immediately="true" color="0.7 0.9 0.7 1"
62 control_name="ObjectIMColor" enabled="true" follows="left|top"
63 height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
64 name="object_ims" width="54" />
65 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
66 can_apply_immediately="true" color="0.7 0.9 0.7 1"
67 enabled="true" follows="left|top"
68 height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
69 width="54" />
70 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
71 can_apply_immediately="true" color="0 0 0 1"
72 enabled="true" follows="left|top"
73 height="56" label="Bubble" left_delta="68" mouse_opaque="true"
74 name="background" width="54" />
75 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
76 can_apply_immediately="true" color="0.6 0.6 1 1"
77 enabled="true" follows="left|top" height="56"
78 label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
79 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
80 bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
81 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 105 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
82 mouse_opaque="false" name="text_box3" v_pad="0" width="135"> 106 mouse_opaque="false" name="text_box3" v_pad="0" width="135">
83 Chat Console: 107 Chat Console:
@@ -115,8 +139,29 @@
115 label="Use full screen width (requires restart)" left="148" 139 label="Use full screen width (requires restart)" left="148"
116 mouse_opaque="true" name="chat_full_width_check" radio_style="false" 140 mouse_opaque="true" name="chat_full_width_check" radio_style="false"
117 width="239" /> 141 width="239" />
142
143 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
144 bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
145 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
146 mouse_opaque="false" name="text_box7" v_pad="0" width="128">
147 Chat Bubbles:
148 </text>
149 <check_box bottom_delta="-8" control_name="UseChatBubbles" enabled="true" follows="left|top"
150 font="SansSerifSmall" height="16" initial_value="false"
151 label="Show chat bubbles" left="148" mouse_opaque="true"
152 name="bubble_text_chat" radio_style="false" width="237" />
153 <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
154 font="SansSerifSmall" height="16" initial_value="false"
155 label="Show local chat and bubbles" left="288" mouse_opaque="true"
156 name="local_bubble_text_chat" radio_style="false" width="237" />
157 <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
158 decimal_digits="3" enabled="true" follows="left|top" height="12"
159 increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
160 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
161 value="0.5" width="225" />
162
118 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 163 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
119 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 164 bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
120 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12" 165 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
121 mouse_opaque="false" name="text_box6" v_pad="0" width="135"> 166 mouse_opaque="false" name="text_box6" v_pad="0" width="135">
122 Miscellaneous: 167 Miscellaneous:
@@ -147,98 +192,5 @@
147 font="SansSerifSmall" height="16" initial_value="false" 192 font="SansSerifSmall" height="16" initial_value="false"
148 label="Show custom chat channel" left="148" mouse_opaque="true" 193 label="Show custom chat channel" left="148" mouse_opaque="true"
149 name="toggle_channel_control" radio_style="false" width="237" /> 194 name="toggle_channel_control" radio_style="false" width="237" />
150 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
151 bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
152 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
153 mouse_opaque="false" name="text_box7" v_pad="0" width="128">
154 Chat Bubbles:
155 </text>
156 <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
157 font="SansSerifSmall" height="16" initial_value="false"
158 label="Show chat bubbles" left="148" mouse_opaque="true"
159 name="bubble_text_chat" radio_style="false" width="237" />
160 <check_box bottom="-386" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
161 font="SansSerifSmall" height="16" initial_value="false"
162 label="Show local chat and bubbles" left="288" mouse_opaque="true"
163 name="local_bubble_text_chat" radio_style="false" width="237" />
164 <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
165 decimal_digits="3" enabled="true" follows="left|top" height="12"
166 increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
167 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
168 value="0.5" width="225" />
169 195
170 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
171 bottom="-420" drop_shadow_visible="true" enabled="true" follows="left|top"
172 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
173 mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
174 Translate Chat:
175 </text>
176 <check_box bottom="-427" control_name="TranslateChat" enabled="true" follows="left|top"
177 font="SansSerifSmall" height="16" initial_value="false"
178 label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
179 name="translate_chat" radio_style="false" width="237" />
180 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
181 bottom="-442" drop_shadow_visible="true" enabled="true" follows="left|top"
182 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
183 mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
184 Translate into this language:
185 </text>
186 <combo_box allow_text_entry="true" bottom="-448" enabled="true"
187 follows="left|top" height="16" left_delta="183" max_chars="135"
188 mouse_opaque="true" name="translate_language_combobox" width="146">
189 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
190 System Default
191 </combo_item>
192 <combo_item type="string" length="1" enabled="true" name="English" value="en">
193 English
194 </combo_item>
195
196 <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
197
198 <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
199 Dansk (Danish)
200 </combo_item>
201 <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
202 Deutsch (German)
203 </combo_item>
204 <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
205 Español (Spanish)
206 </combo_item>
207 <combo_item type="string" length="1" enabled="true" name="French" value="fr">
208 Français (French)
209 </combo_item>
210 <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
211 Italiano (Italian)
212 </combo_item>
213 <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
214 Magyar (Hungarian)
215 </combo_item>
216 <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
217 Nederlands (Dutch)
218 </combo_item>
219 <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
220 Polski (Polish)
221 </combo_item>
222 <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
223 Portugués (Portuguese)
224 </combo_item>
225 <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
226 Русский (Russian)
227 </combo_item>
228 <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
229 Türkçe (Turkish)
230 </combo_item>
231 <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
232 Українська (Ukrainian)
233 </combo_item>
234 <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
235 中文 (简体) (Chinese)
236 </combo_item>
237 <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
238 日本語 (Japanese)
239 </combo_item>
240 <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
241 한국어 (Korean)
242 </combo_item>
243 </combo_box>
244</panel> 196</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
new file mode 100644
index 0000000..40a75a6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -0,0 +1,115 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="Chat Colors" left="102" mouse_opaque="true" name="colors"
4 width="517">
5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
7 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
8 mouse_opaque="false" name="text_box2" v_pad="0" width="128">
9 Chat Colors:
10 </text>
11 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
12 can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
13 enabled="true" follows="left|top" height="65" label="Your chat" left="120"
14 mouse_opaque="true" name="user" width="65" />
15 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
16 can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
17 enabled="true" follows="left|top" height="65" label="Others' chat" left_delta="76"
18 mouse_opaque="true" name="agent" width="65" />
19 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
20 can_apply_immediately="true" color="0.6 0.6 1 1"
21 enabled="true" follows="left|top" height="65" label="IMs" left_delta="76"
22 mouse_opaque="true" name="im" width="65" />
23 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
24 can_apply_immediately="true" color="0.8 1 1 1"
25 enabled="true" follows="left|top"
26 height="65" label="System" left_delta="76" mouse_opaque="true"
27 name="system" width="65" />
28 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
29 can_apply_immediately="true" color="0.82 0.82 0.99 1"
30 control_name="ScriptErrorColor" enabled="true" follows="left|top"
31 height="65" label="Script errors" left_delta="76" mouse_opaque="true"
32 name="script_error" width="65" />
33 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
34 can_apply_immediately="true" color="0.7 0.9 0.7 1"
35 control_name="ObjectChatColor" enabled="true" follows="left|top"
36 height="65" label="Object chat" left="120" mouse_opaque="true"
37 name="objects" width="65" />
38 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
39 can_apply_immediately="true" color="0.7 0.9 0.7 1"
40 control_name="ObjectIMColor" enabled="true" follows="left|top"
41 height="65" label="Object IMs" left_delta="76" mouse_opaque="true"
42 name="object_ims" width="65" />
43 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
44 can_apply_immediately="true" color="0.7 0.9 0.7 1"
45 enabled="true" follows="left|top"
46 height="65" label="Owner chat" left_delta="76" mouse_opaque="true" name="owner"
47 width="65" />
48 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
49 can_apply_immediately="true" color="0 0 0 1"
50 enabled="true" follows="left|top"
51 height="65" label="Bubble chat" left_delta="76" mouse_opaque="true"
52 name="background" width="65" />
53 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
54 can_apply_immediately="true" color="0.6 0.6 1 1"
55 enabled="true" follows="left|top" height="65"
56 label="Links" left_delta="76" mouse_opaque="true" name="links" width="65" />
57
58 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
59 bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
60 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
61 mouse_opaque="false" name="text_box3" v_pad="0" width="128">
62 Line Highlighting:
63 </text>
64
65 <check_box bottom_delta="-7" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
66 initial_value="true" label="Highlight chat from friends" left="120"
67 mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
68 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
69 can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
70 enabled="true" follows="left|top" height="65" label="Friends" left_delta="20"
71 mouse_opaque="true" name="FriendsChatColor" width="65" />
72
73 <check_box bottom_delta="-25" enabled="true" follows="left|top"
74 font="SansSerifSmall" height="16" initial_value="true"
75 label="Highlight local chat containing your name" left="120" mouse_opaque="true"
76 name="HighlightOwnNameInChat" radio_style="false" width="217" />
77 <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
78 initial_value="true" label="Highlight group chat containing your name" left_delta="0"
79 mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
80 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
81 can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
82 enabled="true" follows="left|top" height="65" label="Your name" left_delta="20"
83 mouse_opaque="true" name="OwnNameChatColor" width="65" />
84
85 <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20"
86 left="140" name="nick01_text" width="150">
87 Highlight nickname 1:
88 </text>
89 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
90 enabled="true" follows="left|top" font="SansSerif"
91 handle_edit_keys_directly="true" height="20" left_delta="125"
92 max_length="50" mouse_opaque="true" name="nick01"
93 select_all_on_focus_received="true" width="160" word_wrap="false" />
94
95 <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
96 left="140" name="nick02_text" width="150">
97 Highlight nickname 2:
98 </text>
99 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
100 enabled="true" follows="left|top" font="SansSerif"
101 handle_edit_keys_directly="true" height="20" left_delta="125"
102 max_length="50" mouse_opaque="true" name="nick02"
103 select_all_on_focus_received="true" width="160" word_wrap="false" />
104
105 <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
106 left="140" name="nick03_text" width="150">
107 Highlight nickname 3:
108 </text>
109 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
110 enabled="true" follows="left|top" font="SansSerif"
111 handle_edit_keys_directly="true" height="20" left_delta="125"
112 max_length="50" mouse_opaque="true" name="nick03"
113 select_all_on_focus_received="true" width="160" word_wrap="false" />
114
115</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index b47794b..4b0b292 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -17,7 +17,7 @@
17 </combo_item> 17 </combo_item>
18 </combo_box> 18 </combo_box>
19 <button name="grid_btn" label="Grid Manager" 19 <button name="grid_btn" label="Grid Manager"
20 bottom_delta="0" left="330" height="16" width="100" 20 bottom_delta="-3" left="330" height="20" width="100"
21 follows="left|top" font="SansSerifSmall" halign="center" 21 follows="left|top" font="SansSerifSmall" halign="center"
22 mouse_opaque="true" scale_image="TRUE" /> 22 mouse_opaque="true" scale_image="TRUE" />
23 <check_box bottom="-44" enabled="true" follows="left|top" 23 <check_box bottom="-44" enabled="true" follows="left|top"
@@ -57,9 +57,9 @@
57 font="SansSerifSmall" height="16" initial_value="false" 57 font="SansSerifSmall" height="16" initial_value="false"
58 label="Hide all group titles" left="151" mouse_opaque="true" 58 label="Hide all group titles" left="151" mouse_opaque="true"
59 name="show_all_title_checkbox" radio_style="false" width="256" /> 59 name="show_all_title_checkbox" radio_style="false" width="256" />
60 <check_box bottom_delta="-18" follows="left|top" 60 <check_box bottom_delta="0" follows="left|top"
61 font="SansSerifSmall" height="16" initial_value="false" 61 font="SansSerifSmall" height="16" initial_value="false"
62 label="Hide my group title" left="151" name="show_my_title_checkbox" 62 label="Hide my group title" left="330" name="show_my_title_checkbox"
63 radio_style="false" width="256" /> 63 radio_style="false" width="256" />
64 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210" 64 <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
65 can_apply_immediately="false" color="1 1 1 1" 65 can_apply_immediately="false" color="1 1 1 1"
@@ -181,16 +181,6 @@
181 v_pad="0" width="400"> 181 v_pad="0" width="400">
182 (requires restart for full effect) 182 (requires restart for full effect)
183 </text> 183 </text>
184 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
185 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
186 font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
187 mouse_opaque="true" name="remember_password_text" v_pad="0" width="394">
188 Remember Password:
189 </text>
190 <check_box bottom_delta="0" follows="left|top"
191 font="SansSerifSmall" height="16" initial_value="false"
192 label="Remember Password" left="151" mouse_opaque="true"
193 name="remember_password" radio_style="false" width="256" />
194 <string name="region_name_prompt"> 184 <string name="region_name_prompt">
195 &lt;Type region name&gt; 185 &lt;Type region name&gt;
196 </string> 186 </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 72a6438..2ed0869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -29,9 +29,6 @@
29 <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top" 29 <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
30 height="18" left="185" max_chars="20" mouse_opaque="true" 30 height="18" left="185" max_chars="20" mouse_opaque="true"
31 name="windowsize combo" width="150"> 31 name="windowsize combo" width="150">
32 <combo_item type="string" length="1" enabled="true" name="640x480" value="640 x 480">
33 640x480
34 </combo_item>
35 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600"> 32 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
36 800x600 33 800x600
37 </combo_item> 34 </combo_item>
@@ -44,8 +41,16 @@
44 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768"> 41 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
45 1024x768 42 1024x768
46 </combo_item> 43 </combo_item>
47 44 <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
48 </combo_box> 45 1280x720 (HDV720)
46 </combo_item>
47 <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
48 1440x1080 (HDV1080)
49 </combo_item>
50 <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
51 1920x1080 (HD1080)
52 </combo_item>
53 </combo_box>
49 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 54 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
50 bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top" 55 bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
51 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 56 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -237,35 +242,21 @@
237 radio_style="false" width="256" /> 242 radio_style="false" width="256" />
238 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 243 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
239 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 244 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
240 font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 245 font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0"
241 mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128"> 246 mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
242 Max. non-imposters: 247 Max. non-imposters:
243 </text> 248 </text>
244 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarMaxVisible" 249 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
245 decimal_digits="0" enabled="true" follows="left|top" height="16" 250 decimal_digits="0" enabled="true" follows="left|top" height="16"
246 increment="1" initial_val="35" label="" 251 increment="1" initial_val="35" label=""
247 label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true" 252 label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
248 name="AvatarMaxVisible" show_text="true" width="100" /> 253 name="AvatarMaxVisible" show_text="true" width="100" />
249 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 254 <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
250 bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
251 font="SansSerifSmall" h_pad="0" halign="left" height="12"
252 left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
253 width="128">
254 m
255 </text>
256 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
257 bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
258 font="SansSerifSmall" h_pad="0" halign="left" height="12"
259 left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
260 width="128">
261 m
262 </text>
263 <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
264 decimal_digits="0" enabled="true" follows="left|top" height="16" 255 decimal_digits="0" enabled="true" follows="left|top" height="16"
265 increment="8" initial_val="160" label="Draw distance:" 256 increment="4" initial_val="160" label="Draw distance (meters):"
266 label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true" 257 label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
267 name="DrawDistance" show_text="true" width="255" /> 258 name="DrawDistance" show_text="true" width="262" />
268 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount" 259 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
269 decimal_digits="0" enabled="true" follows="left|top" height="16" 260 decimal_digits="0" enabled="true" follows="left|top" height="16"
270 increment="256" initial_val="4096" 261 increment="256" initial_val="4096"
271 label="Max. particle count:" label_width="140" left_delta="0" 262 label="Max. particle count:" label_width="140" left_delta="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index bb5002b..e64f6c7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" 2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="Communication" left="102" mouse_opaque="true" name="im" 3 height="408" label="IMs &amp; Logging" left="102" mouse_opaque="true" name="im"
4 width="517"> 4 width="517">
5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 5 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
6 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 6 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index fc9b6cd..b4939ca 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" 2<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
3 height="408" label="Voice Chat" left="102" mouse_opaque="true" name="chat" 3 height="408" label="Voice" left="102" mouse_opaque="true" name="chat"
4 width="517"> 4 width="517">
5 <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26" 5 <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
6 embedded_items="false" enabled="false" follows="left|top" 6 embedded_items="false" enabled="false" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index ce2d5ad..4639ef3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -41,12 +41,12 @@
41 </text> 41 </text>
42 42
43 <slider name="near_me_range" label="" control_name="NearMeRange" 43 <slider name="near_me_range" label="" control_name="NearMeRange"
44 bottom_delta="0" left_delta="62" width="150" height="15" 44 bottom_delta="0" left_delta="58" width="110" height="15"
45 follows="left|top" min_val="5" max_val="2048" increment="1" 45 follows="left|top" min_val="5" max_val="1024" increment="1"
46 initial_val="96" decimal_digits="0" /> 46 initial_val="96" decimal_digits="0" can_edit_text="true" />
47 47
48 <text name="meters" 48 <text name="meters"
49 bottom_delta="0" left_delta="10" height="15" width="40" 49 bottom_delta="0" left_delta="113" height="15" width="40"
50 h_pad="0" halign="left" v_pad="0" follows="left|top" 50 h_pad="0" halign="left" v_pad="0" follows="left|top"
51 bg_visible="false" border_drop_shadow_visible="false" 51 bg_visible="false" border_drop_shadow_visible="false"
52 border_visible="false" drop_shadow_visible="true" 52 border_visible="false" drop_shadow_visible="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 3849efd..c7769cc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -3,24 +3,17 @@
3 follows="right|bottom" height="67" left="0" mouse_opaque="true" 3 follows="right|bottom" height="67" left="0" mouse_opaque="true"
4 name="windlight_remote" use_bounding_rect="true" width="182"> 4 name="windlight_remote" use_bounding_rect="true" width="182">
5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" /> 5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
6 <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip" 6 <slider bottom="-20" can_edit_text="true" control_name="RenderFarClip"
7 decimal_digits="0" enabled="true" height="18" 7 decimal_digits="0" enabled="true" height="18"
8 increment="8" initial_val="160" label="Draw distance:" 8 increment="4" initial_val="160" label="Draw distance:"
9 label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true" 9 label_width="74" left="4" max_val="1024" min_val="32" mouse_opaque="true"
10 name="DrawDistance" show_text="true" width="170" /> 10 name="DrawDistance" show_text="true" width="174" />
11 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount" 11 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
12 decimal_digits="0" enabled="true" follows="left|top" height="18" 12 decimal_digits="0" enabled="true" follows="left|top" height="18"
13 increment="256" initial_val="4096" 13 increment="256" initial_val="4096"
14 label="Max. particles:" label_width="78" left_delta="0" 14 label="Max. particles:" label_width="74" left_delta="0"
15 max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount" 15 max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
16 show_text="true" width="176" /> 16 show_text="true" width="174" />
17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
19 font="SansSerifSmall" h_pad="0" halign="left" height="12"
20 left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
21 width="8">
22 m
23 </text>
24 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" /> 17 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
25 <string name="atmosphere"> 18 <string name="atmosphere">
26 Atmosphere 19 Atmosphere
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f1892fc..41495ca 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -339,63 +339,64 @@ class WindowsManifest(ViewerManifest):
339 self.path("ortp.dll") 339 self.path("ortp.dll")
340 340
341 self.end_prefix() 341 self.end_prefix()
342 342# Gstreamer is not used in webkit_plugins. The librries are never delivered/extracted to
343# ../../libraries/i686-win32/lib/release . Commented out until decision made to use or drop.
343 # Gstreamer plugins 344 # Gstreamer plugins
344 if self.prefix(src="lib/gstreamer-plugins", dst=""): 345 #if self.prefix(src="lib/gstreamer-plugins", dst=""):
345 self.path("*.dll", dst="lib/gstreamer-plugins/*.dll") 346 # self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
346 self.end_prefix() 347 # self.end_prefix()
347 348
348 # Gstreamer libs 349 # Gstreamer libs
349 if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): 350 #if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
350 self.path("iconv.dll") 351 # self.path("iconv.dll")
351 self.path("libxml2.dll") 352 # self.path("libxml2.dll")
352 self.path("libcairo-2.dll") 353 # self.path("libcairo-2.dll")
353 self.path("libgio-2.0-0.dll") 354 # self.path("libgio-2.0-0.dll")
354 self.path("libglib-2.0-0.dll") 355 # self.path("libglib-2.0-0.dll")
355 self.path("libgmodule-2.0-0.dll") 356 # self.path("libgmodule-2.0-0.dll")
356 self.path("libgobject-2.0-0.dll") 357 # self.path("libgobject-2.0-0.dll")
357 self.path("libgthread-2.0-0.dll") 358 # self.path("libgthread-2.0-0.dll")
358 self.path("charset.dll") 359 # self.path("charset.dll")
359 self.path("intl.dll") 360 # self.path("intl.dll")
360 self.path("libgcrypt-11.dll") 361 # self.path("libgcrypt-11.dll")
361 self.path("libgnutls-26.dll") 362 # self.path("libgnutls-26.dll")
362 self.path("libgpg-error-0.dll") 363 # self.path("libgpg-error-0.dll")
363 self.path("libgstapp.dll") 364 # self.path("libgstapp.dll")
364 self.path("libgstaudio.dll") 365 # self.path("libgstaudio.dll")
365 self.path("libgstbase-0.10.dll") 366 # self.path("libgstbase-0.10.dll")
366 self.path("libgstcdda.dll") 367 # self.path("libgstcdda.dll")
367 self.path("libgstcontroller-0.10.dll") 368 # self.path("libgstcontroller-0.10.dll")
368 self.path("libgstdataprotocol-0.10.dll") 369 # self.path("libgstdataprotocol-0.10.dll")
369 self.path("libgstdshow.dll") 370 # self.path("libgstdshow.dll")
370 self.path("libgstfft.dll") 371 # self.path("libgstfft.dll")
371 self.path("libgstinterfaces.dll") 372 # self.path("libgstinterfaces.dll")
372 self.path("libgstnet-0.10.dll") 373 # self.path("libgstnet-0.10.dll")
373 self.path("libgstnetbuffer.dll") 374 # self.path("libgstnetbuffer.dll")
374 self.path("libgstpbutils.dll") 375 # self.path("libgstpbutils.dll")
375 self.path("libgstreamer-0.10.dll") 376 # self.path("libgstreamer-0.10.dll")
376 self.path("libgstriff.dll") 377 # self.path("libgstriff.dll")
377 self.path("libgstrtp.dll") 378 # self.path("libgstrtp.dll")
378 self.path("libgstrtsp.dll") 379 # self.path("libgstrtsp.dll")
379 self.path("libgstsdp.dll") 380 # self.path("libgstsdp.dll")
380 self.path("libgsttag.dll") 381 # self.path("libgsttag.dll")
381 self.path("libgstvideo.dll") 382 # self.path("libgstvideo.dll")
382 self.path("libjpeg.dll") 383 # self.path("libjpeg.dll")
383 self.path("libmp3lame-0.dll") 384 # self.path("libmp3lame-0.dll")
384 self.path("libneon-27.dll") 385 # self.path("libneon-27.dll")
385 self.path("libogg-0.dll") 386 # self.path("libogg-0.dll")
386 self.path("liboil-0.3-0.dll") 387 # self.path("liboil-0.3-0.dll")
387 self.path("libopenjpeg-2.dll") 388 # self.path("libopenjpeg-2.dll")
388 self.path("libpng12-0.dll") 389 # self.path("libpng12-0.dll")
389 self.path("libschroedinger-1.0-0.dll") 390 # self.path("libschroedinger-1.0-0.dll")
390 self.path("libspeex-1.dll") 391 # self.path("libspeex-1.dll")
391 self.path("libtheora-0.dll") 392 # self.path("libtheora-0.dll")
392 self.path("libvorbis-0.dll") 393 # self.path("libvorbis-0.dll")
393 self.path("libvorbisenc-2.dll") 394 # self.path("libvorbisenc-2.dll")
394 self.path("libxml2-2.dll") 395 # self.path("libxml2-2.dll")
395 self.path("glew32.dll") 396 # self.path("glew32.dll")
396 self.path("xvidcore.dll") 397 # self.path("xvidcore.dll")
397 self.path("zlib1.dll") 398 # self.path("zlib1.dll")
398 self.end_prefix() 399 # self.end_prefix()
399 400
400# # pull in the crash logger and updater from other projects 401# # pull in the crash logger and updater from other projects
401# self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter 402# self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
@@ -1086,7 +1087,7 @@ class Linux_x86_64Manifest(LinuxManifest):
1086 self.path("libuuid.so", "libuuid.so.1") 1087 self.path("libuuid.so", "libuuid.so.1")
1087 self.path("libSDL-1.2.so.0") 1088 self.path("libSDL-1.2.so.0")
1088 self.path("libELFIO.so") 1089 self.path("libELFIO.so")
1089 self.path("libjpeg.so.62") 1090 self.path("libjpeg.so.7")
1090 self.path("libpng12.so.0") 1091 self.path("libpng12.so.0")
1091 self.path("libopenjpeg.so.2") 1092 self.path("libopenjpeg.so.2")
1092 self.path("libxml2.so.2") 1093 self.path("libxml2.so.2")
diff --git a/linden/install.xml b/linden/install.xml
index 04d7b5e..a3dc2c1 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -794,10 +794,10 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
794 </map> 794 </map>
795 <key>linux64</key> 795 <key>linux64</key>
796 <map> 796 <map>
797 <key>md5sum</key> 797 <key>md5sum</key>
798 <string>8b5f413bdefec7cfe3d9ad2d69986bdc</string> 798 <string>64e7fa98568ef52b3b9d4a18b3515090</string>
799 <key>url</key> 799 <key>url</key>
800 <uri>http://imprudenceviewer.org/download/libs/jpeglib-6b-linux64-20101012.tar.bz2</uri> 800 <uri>http://imprudenceviewer.org/download/libs/jpeglib-7-linux64-20091230.tar.bz2</uri>
801 </map> 801 </map>
802 <key>windows</key> 802 <key>windows</key>
803 <map> 803 <map>
@@ -1048,12 +1048,12 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
1048 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri> 1048 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri>
1049 </map> 1049 </map>
1050 <key>linux64</key> 1050 <key>linux64</key>
1051 <map> 1051 <map>
1052 <key>md5sum</key> 1052 <key>md5sum</key>
1053 <string>863f7b31556b1d368651f85457f4e46d</string> 1053 <string>d5deaf897fe8effa3d3537c875060379</string>
1054 <key>url</key> 1054 <key>url</key>
1055 <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20101012.1.tar.bz2</uri> 1055 <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20100907.tar.bz2</uri>
1056 </map> 1056 </map>
1057 <key>windows</key> 1057 <key>windows</key>
1058 <map> 1058 <map>
1059 <key>md5sum</key> 1059 <key>md5sum</key>
generated by cgit v1.1 at 2024-11-15 21:25:12 +0000