livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Starlight? Wat dat?" 

This reverts commit 8dc785c484.
master
Nicky 2022-04-30 13:19:11 +02:00
parent 4ee757a91b
commit 21caff1c7a
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -20974,7 +20974,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>0.0</real>
</map>
<key>FSShowMapDetails</key>
<key>StarLightShowMapDetails</key>
<map>
<key>Comment</key>
<string>Show the details panel on the side of the World Map</string>

2
indra/newview/llmoveview.cpp
View File

@ -691,7 +691,7 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view)
// Attach to movement controls.
parent->removeChild(this);
// <FS:Ansariel> FIRE-9636: Resizable movement controls
// <FS:Ansariel> FIRE-9636: Resizable movement controls (for all skins except Starlight/CUI)
//move_view->addChild(this);
LLView* modes_container = move_view->findChildView("modes_container");
if (modes_container)

11
indra/newview/skins/default/textures/textures.xml
View File

@ -1015,13 +1015,16 @@ with the same filename but different name
<texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
<texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png" preload="true"/>
<texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png" preload="true"/>
<!-- StarLight Textures -->
<texture name="SpeakBtn_Left_Selected_Press" file_name="widgets/SpeakBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SpeakBtn_Left_Off" file_name="widgets/SpeakBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SpeakBtn_Right_Selected_Press" file_name="widgets/SpeakBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SpeakBtn_Right_Off" file_name="widgets/SpeakBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<!-- Firestorm Textures -->
<texture name="SpeakBtn_Left_Selected_Press" file_name="widgets/SpeakBtn_Left_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SpeakBtn_Left_Off" file_name="widgets/SpeakBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SpeakBtn_Right_Selected_Press" file_name="widgets/SpeakBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="SpeakBtn_Right_Off" file_name="widgets/SpeakBtn_Right_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="profile_icon_24x24" file_name="icons/profile_icon_24x24.png" preload="false" />
<texture name="sale_icon_24x24" file_name="icons/sale_icon_24x24.png" preload="false" />
<texture name="call_icon_24x24" file_name="icons/call_icon_24x24.png" preload="false" />

4
indra/newview/skins/default/xui/en/floater_world_map.xml
View File

@ -104,7 +104,7 @@
/>
<button
control_name="FSShowMapDetails"
control_name="StarLightShowMapDetails"
follows="all"
height="512"
image_unselected="Arrow_Left_Unscaled"
@ -128,7 +128,7 @@
left_delta="0"
min_width="258"
height="512"
visibility_control="FSShowMapDetails"
visibility_control="StarLightShowMapDetails"
auto_resize="false"
name="map_details_panel">
<panel