summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llfloaterregioninfo.cpp5
-rw-r--r--indra/newview/llfloaterregioninfo.h6
-rw-r--r--indra/newview/skins/default/xui/en/floater_region_info.xml151
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml140
4 files changed, 152 insertions, 150 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 2acb0936dc..5bf6140f02 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -201,6 +201,11 @@ BOOL LLFloaterRegionInfo::postBuild()
panel->buildFromFile("panel_region_terrain.xml");
mTab->addTabPanel(panel);
+ panel = new LLPanelEnvironmentInfo;
+ mInfoPanels.push_back(panel);
+ panel->buildFromFile("panel_region_environment.xml");
+ mTab->addTabPanel(panel);
+
panel = new LLPanelEstateInfo;
mInfoPanels.push_back(panel);
panel->buildFromFile("panel_region_estate.xml");
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index f5c5e21938..f3f75dc84f 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -439,4 +439,10 @@ protected:
EAssetStatus mAssetStatus;
};
+/////////////////////////////////////////////////////////////////////////////
+
+class LLPanelEnvironmentInfo : public LLPanelRegionInfo
+{
+};
+
#endif
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 017c70cf49..3b58cd08f6 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -16,154 +16,5 @@
name="region_panels"
right="-1"
tab_position="top"
- top="20">
-
- <!-- Temporary panel. It will be deleted from this xml. It'll be added the same way as others tab panels -->
- <panel
- border="true"
- bevel_style="none"
- follows="top|left"
- height="320"
- label="Emvironment"
- layout="topleft"
- left="0"
- name="environment_tab"
- width="4250">
-
- <!-- Water Settings -->
- <view_border
- bevel_style="none"
- follows="top|left"
- height="100"
- layout="topleft"
- left="50"
- name="water_panel"
- top="50"
- width="430"/>
- <text
- name="water_settings_title"
- follows="top|left"
- height="16"
- layout="topleft"
- left_delta="5"
- top_delta="5"
- width="35">
- Water
- </text>
-
- <radio_group
- follows="top|left"
- height="45"
- layout="topleft"
- name="water_settings_radio_group"
- top_pad="20"
- width="200">
- <radio_item
- label="Use region settings"
- layout="topleft"
- name="region_water_settings"/>
- <radio_item
- label="Use my settings"
- layout="topleft"
- name="my_water_settings"
- top_pad="20"/>
- </radio_group>
- <combo_box
- follows="top|left"
- left_pad="2"
- name="water_settings_preset_combo"
- top_delta="24"
- width="200">
- </combo_box>
-
-
- <!-- Sky/Day Cycle Settings -->
- <view_border
- bevel_style="none"
- follows="top|left"
- height="180"
- layout="topleft"
- left="50"
- name="sky_dayc_panel"
- top="175"
- width="430"/>
- <text
- name="sky_dayc_settings_title"
- follows="top|left"
- height="16"
- layout="topleft"
- left="55"
- top_delta="5"
- width="100">
- Sky / Day Cycle
- </text>
-
- <radio_group
- follows="top|left"
- height="45"
- layout="topleft"
- name="sky_dayc_settings_radio_group1"
- top_pad="20"
- width="200">
- <radio_item
- layout="topleft"
- label="Use region settings"
- name="region_sky_dayc_settings"/>
- <radio_item
- layout="topleft"
- label="Use my settings"
- name="my_sky_dayc_settings"
- top_pad="20"/>
- </radio_group>
-
- <radio_group
- layout="topleft"
- left_delta="50"
- name="sky_dayc_settings_radio_group2"
- top_pad="10"
- height="50"
- width="150">
- <radio_item
- layout="topleft"
- label="Fixed sky"
- name="my_sky_settings"/>
- <radio_item
- layout="topleft"
- label="Day cycle"
- name="my_dayc_settings"
- top_pad="25"/>
- </radio_group>
- <combo_box
- follows="top|left"
- left_pad="2"
- name="sky_settings_preset_combo"
- top_delta="-7"
- width="200">
- </combo_box>
- <combo_box
- follows="top|left"
- name="dayc_settings_preset_combo"
- top_delta="36"
- width="200">
- </combo_box>
-
- <button
- follows="bottom|right"
- height="23"
- label="Save"
- layout="topleft"
- left_pad="0"
- name="save"
- width="70"/>
- <button
- follows="bottom|right"
- height="23"
- label="Cancel"
- layout="topleft"
- left_pad="15"
- name="cancel"
- width="70"/>
- </panel>
-
- </tab_container>
+ top="20"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
new file mode 100644
index 0000000000..907a707db8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel
+ follows="top|left"
+ height="300"
+ label="Environment"
+ layout="topleft"
+ name="panel_env_info"
+ width="530">
+ <text
+ name="water_settings_title"
+ follows="top|left"
+ height="30"
+ layout="topleft"
+ left="50"
+ top_pad="20"
+ width="430"
+ wrap="true">
+ Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see. More info
+ </text>
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="237"
+ layout="topleft"
+ left="50"
+ name="border"
+ top="60"
+ width="430"/>
+ <radio_group
+ follows="top|left"
+ height="45"
+ layout="topleft"
+ left_delta="10"
+ name="region_settings_radio_group"
+ top_delta="20"
+ width="200">
+ <radio_item
+ label="Use Second Life default"
+ layout="topleft"
+ name="use_sl_default_settings"/>
+ <radio_item
+ label="Use my settings"
+ layout="topleft"
+ name="use_my_settings"
+ top_pad="20"/>
+ </radio_group>
+ <panel
+ follows="top|left"
+ height="170"
+ layout="topleft"
+ left="50"
+ name="user_environment_settings"
+ top_pad="20"
+ width="430">
+ <text
+ name="water_settings_title"
+ follows="top|left"
+ height="16"
+ layout="topleft"
+ left="50"
+ top_pad="0"
+ width="160">
+ Water Setting
+ </text>
+ <combo_box
+ follows="top|left"
+ left_pad="2"
+ name="water_settings_preset_combo"
+ top_delta="-7"
+ width="200">
+ <combo_box.item
+ label="-Select a preset-"
+ name="item0"/>
+ </combo_box>
+ <text
+ name="sky_dayc_settings_title"
+ follows="top|left"
+ height="16"
+ layout="topleft"
+ left="50"
+ top_pad="30"
+ width="100">
+ Sky / Day Cycle
+ </text>
+ <radio_group
+ layout="topleft"
+ left_delta="50"
+ name="sky_dayc_settings_radio_group"
+ top_pad="10"
+ height="50"
+ width="110">
+ <radio_item
+ layout="topleft"
+ label="Fixed sky"
+ name="my_sky_settings"/>
+ <radio_item
+ layout="topleft"
+ label="Day cycle"
+ name="my_dayc_settings"
+ top_pad="25"/>
+ </radio_group>
+ <combo_box
+ follows="top|left"
+ left_pad="2"
+ name="sky_settings_preset_combo"
+ top_delta="-7"
+ width="200">
+ <combo_box.item
+ label="-Select a preset-"
+ name="item0"/>
+ </combo_box>
+ <combo_box
+ follows="top|left"
+ name="dayc_settings_preset_combo"
+ top_delta="36"
+ width="200">
+ <combo_box.item
+ label="-Select a preset-"
+ name="item0"/>
+ </combo_box>
+ </panel>
+ <button
+ follows="left|top"
+ height="23"
+ label="Save"
+ layout="topleft"
+ right="-160"
+ name="save_btn"
+ top_pad="150"
+ width="100" />
+ <button
+ follows="left|top"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ left_pad="10"
+ name="cancel_btn"
+ width="100" />
+</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 03:23:13 +0000