diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/skins/silver/colors_base.xml | 13 |
2 files changed, 3 insertions, 12 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 64402e3..9e68078 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -1605,7 +1605,7 @@ bool LLAppViewer::initConfiguration() | |||
1605 | 1605 | ||
1606 | // - set procedural settings | 1606 | // - set procedural settings |
1607 | gSavedSettings.setString("ClientSettingsFile", | 1607 | gSavedSettings.setString("ClientSettingsFile", |
1608 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global"))); | 1608 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml")); |
1609 | 1609 | ||
1610 | gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME); | 1610 | gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME); |
1611 | 1611 | ||
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml index 623b800..2cdfb73 100644 --- a/linden/indra/newview/skins/silver/colors_base.xml +++ b/linden/indra/newview/skins/silver/colors_base.xml | |||
@@ -100,9 +100,9 @@ | |||
100 | <PieMenuSelectedColor value="185, 200, 220, 120" /> <!-- Color of pie menu slice when selected --> | 100 | <PieMenuSelectedColor value="185, 200, 220, 120" /> <!-- Color of pie menu slice when selected --> |
101 | 101 | ||
102 | <!-- MENU BAR --> | 102 | <!-- MENU BAR --> |
103 | <ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state --> | 103 | <ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state --> |
104 | <ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state --> | 104 | <ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state --> |
105 | <TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar --> | 105 | <TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar --> |
106 | <BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar --> | 106 | <BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar --> |
107 | <HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar --> | 107 | <HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar --> |
108 | 108 | ||
@@ -175,14 +175,6 @@ | |||
175 | <FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text --> | 175 | <FilterTextColor value="255, 200, 70, 255" /> <!-- Inventory search text --> |
176 | <InventorySearchStatusColor value="0, 0, 0, 255" /> <!-- "Searching..." --> | 176 | <InventorySearchStatusColor value="0, 0, 0, 255" /> <!-- "Searching..." --> |
177 | 177 | ||
178 | <!-- HELP WINDOW --> | ||
179 | <HelpBgColor value="200, 209, 204, 255" /> | ||
180 | <HelpFgColor value="0, 0, 0, 255" /> | ||
181 | <HelpScrollTrackColor value="0, 0, 0, 255" /> | ||
182 | <HelpScrollThumbColor value="255, 255, 255, 255" /> | ||
183 | <HelpScrollHighlightColor value="115, 132, 155, 255" /> | ||
184 | <HelpScrollShadowColor value="0, 0, 0, 255" /> | ||
185 | |||
186 | <!-- MISC --> | 178 | <!-- MISC --> |
187 | <AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> | 179 | <AvatarNameColor value="251, 175, 93, 255" /> <!-- Text color of avatar nametags --> |
188 | <FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> | 180 | <FocusColor value="239, 156, 0, 255" /> <!-- Color of the glow around UI controls with keyboard focus --> |
@@ -192,5 +184,4 @@ | |||
192 | <ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> | 184 | <ContextSilhouetteColor value="239, 156, 0, 255" /> <!-- For "context" highlighting, i.e. pie menu --> |
193 | <GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window --> | 185 | <GroupOverTierColor value="110, 15, 15, 255" /> <!-- Warning text in Group Info window --> |
194 | <ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat --> | 186 | <ConsoleBackground value="0, 0, 0, 255" /> <!-- Background for inworld chat --> |
195 | |||
196 | </settings> | 187 | </settings> |