Remove orphans of now obsolete custom cloud selection
Ansariel
parent
78836def88
commit
de799c897a
|
|
@ -22631,17 +22631,6 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>Backup</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>FSCloudTexture</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Windlight cloud texture (don't edit by hand)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>Default.tga</string>
|
||||
</map>
|
||||
<key>FSLoginDontSavePassword</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -35,7 +35,6 @@
|
|||
#include "llagent.h"
|
||||
#include "llcheckboxctrl.h"
|
||||
#include "llcombobox.h"
|
||||
#include "lldiriterator.h"
|
||||
#include "llfloaterreg.h"
|
||||
#include "llinventorymodel.h"
|
||||
#include "llstartup.h"
|
||||
|
|
@ -69,8 +68,6 @@ BOOL FSPanelPrefs::postBuild()
|
|||
|
||||
getChild<LLUICtrl>("reset_default_folders")->setCommitCallback(boost::bind(&FSPanelPrefs::onResetDefaultFolders, this));
|
||||
|
||||
populateCloudCombo();
|
||||
|
||||
LLTextureCtrl* tex_ctrl = getChild<LLTextureCtrl>("texture control");
|
||||
tex_ctrl->setCommitCallback(boost::bind(&FSPanelPrefs::onCommitTexture, this, _2));
|
||||
tex_ctrl->setDefaultImageAssetID(LLUUID(gSavedSettings.getString("DefaultObjectTexture")));
|
||||
|
|
@ -222,23 +219,6 @@ void FSPanelPrefs::onBeamDelete()
|
|||
refreshBeamLists();
|
||||
}
|
||||
|
||||
void FSPanelPrefs::populateCloudCombo()
|
||||
{
|
||||
LLComboBox* cloud_combo = findChild<LLComboBox>("cloud_combo");
|
||||
if (cloud_combo)
|
||||
{
|
||||
const std::string cloudDir(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight" + gDirUtilp->getDirDelimiter() + "clouds"));
|
||||
|
||||
LLDirIterator dir_iter(cloudDir, "*.tga");
|
||||
std::string file;
|
||||
while (dir_iter.next(file))
|
||||
{
|
||||
cloud_combo->add(file);
|
||||
}
|
||||
cloud_combo->setSimple(gSavedSettings.getString("FSCloudTexture"));
|
||||
}
|
||||
}
|
||||
|
||||
void FSPanelPrefs::onCommitTexture(const LLSD& data)
|
||||
{
|
||||
LLTextureCtrl* texture_ctrl = findChild<LLTextureCtrl>("texture control");
|
||||
|
|
|
|||
|
|
@ -50,8 +50,6 @@ private:
|
|||
void onBeamColorDelete();
|
||||
void onBeamDelete();
|
||||
|
||||
void populateCloudCombo();
|
||||
|
||||
void onCommitTexture(const LLSD& data);
|
||||
void onCommitCopy();
|
||||
void onCommitTrans();
|
||||
|
|
|
|||
|
|
@ -133,10 +133,6 @@
|
|||
<check_box label="WL-Einstellungen von Freunden automatisch übernehmen" name="FSWLWhitelistFriends"/>
|
||||
<check_box label="WL-Einstellungen von Land im Besitz meiner Gruppen automatisch übernehmen" name="FSWLWhitelistGroups"/>
|
||||
<check_box label="WL-Einstellungen von allen Parzellen automatisch übernehmen" name="FSWLWhitelistAll"/>
|
||||
<text name="could_texture_text">
|
||||
Wolken-Textur (Neustart empfohlen)
|
||||
</text>
|
||||
<combo_box name="cloud_combo" tool_tip="Wolken-Textur auswählen, die im Viewer verwendet werden soll."/>
|
||||
</panel>
|
||||
|
||||
<!--Build 1-->
|
||||
|
|
|
|||
|
|
@ -882,28 +882,6 @@
|
|||
height="16"
|
||||
name="FSWLWhitelistAll"
|
||||
width="256" />
|
||||
|
||||
<text
|
||||
top_pad="10"
|
||||
type="string"
|
||||
length="1"
|
||||
follows="left|top"
|
||||
height="15"
|
||||
layout="topleft"
|
||||
left="10"
|
||||
name="could_texture_text"
|
||||
width="220">
|
||||
Cloud texture (restart recommended):
|
||||
</text>
|
||||
<combo_box
|
||||
allow_text_entry="false"
|
||||
left_pad="5"
|
||||
follows="left|top"
|
||||
height="20"
|
||||
name="cloud_combo"
|
||||
width="130"
|
||||
control_name="FSCloudTexture"
|
||||
tool_tip="Select the cloud texture you would like to use."/>
|
||||
</panel>
|
||||
|
||||
<!--Build 1-->
|
||||
|
|
|
|||
|
|
@ -93,10 +93,6 @@
|
|||
<check_box label="Autoaplicar las configuraciones WL de los terrenos de mis amigos" name="FSWLWhitelistFriends"/>
|
||||
<check_box label="Autoaplicar las configuraciones WL de los terrenos de mis grupos" name="FSWLWhitelistGroups"/>
|
||||
<check_box label="Autoaplicar las configuraciones WL de cualquier parcela" name="FSWLWhitelistAll"/>
|
||||
<text name="could_texture_text" width="225">
|
||||
Textura de nube (reinicio recomendado):
|
||||
</text>
|
||||
<combo_box name="cloud_combo" tool_tip="Selecciona la textura de nube que quieres usar."/>
|
||||
</panel>
|
||||
<panel label="Constr. 1" name="BuildTab">
|
||||
<text name="text_box_objprams" left="17">
|
||||
|
|
|
|||
|
|
@ -78,8 +78,6 @@
|
|||
<check_box label="Appliquer automatiquement les paramètres WL des terrains de mes amis" name="FSWLWhitelistFriends"/>
|
||||
<check_box label="Appliquer automatiquement les paramètres WL des terrains de de mes groupes" name="FSWLWhitelistGroups"/>
|
||||
<check_box label="Appliquer automatiquement les paramètres WL de tous les terrains" name="FSWLWhitelistAll"/>
|
||||
<text name="could_texture_text" width="240">Texture des nuages (Redémarrage requis) :</text>
|
||||
<combo_box name="cloud_combo" tool_tip="Sélectionnez la texture des nuages que vous souhaitez utiliser."/>
|
||||
</panel>
|
||||
<panel label="Construction 1" name="BuildTab">
|
||||
<text name="text_box_objprams">Dimensions par défaut</text>
|
||||
|
|
|
|||
|
|
@ -116,10 +116,6 @@
|
|||
<check_box label="Applica automaticamente le impostazioni ambiente dai terreni di amici" name="FSWLWhitelistFriends" />
|
||||
<check_box label="Applica automaticamente le impostazioni ambiente dai terreni dei miei gruppi" name="FSWLWhitelistGroups" />
|
||||
<check_box label="Applica automaticamente le impostazioni ambiente da qualunque terreno" name="FSWLWhitelistAll" />
|
||||
<text name="could_texture_text">
|
||||
Texture nuvole (riavvio consigliato):
|
||||
</text>
|
||||
<combo_box name="cloud_combo" tool_tip="Scegliere la texture desiderata per le nuvole."/>
|
||||
</panel>
|
||||
<panel label="Costr. 1" name="BuildTab">
|
||||
<text name="text_box_objprams" width="250">
|
||||
|
|
|
|||
|
|
@ -159,11 +159,6 @@
|
|||
<check_box label="フレンドの土地のWindlight設定を自動的に適用する" name="FSWLWhitelistFriends"/>
|
||||
<check_box label="グループの土地のWindlight設定を自動的に適用する" name="FSWLWhitelistGroups" />
|
||||
<check_box label="どんな土地区画のWindlight設定も自動的に適用する" name="FSWLWhitelistAll" />
|
||||
<text name="could_texture_text">
|
||||
雲のテクスチャ（再起動を推奨）:
|
||||
</text>
|
||||
<combo_box name="cloud_combo" tool_tip="使用したい雲のテクスチャを選択して下さい。"/>
|
||||
|
||||
</panel>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -117,10 +117,6 @@
|
|||
<check_box label="Automatycznie stosuj ustawienia WL na działkach znajomych" name="FSWLWhitelistFriends" />
|
||||
<check_box label="Automatycznie stosuj ustawienia WL na działkach moich grup" name="FSWLWhitelistGroups" />
|
||||
<check_box label="Automatycznie stosuj ustawienia WL na wszystkich działkach" name="FSWLWhitelistAll" />
|
||||
<text name="could_texture_text">
|
||||
Tekstura chmur (restart zalecany):
|
||||
</text>
|
||||
<combo_box name="cloud_combo" tool_tip="Wybierz teksturę chmur, jakiej chcesz użyć." />
|
||||
</panel>
|
||||
<panel label="Buduj 1" name="BuildTab">
|
||||
<text name="text_box_objprams">
|
||||
|
|
|
|||
|
|
@ -114,10 +114,6 @@
|
|||
<check_box label="Автоматически применять настройки окружающей среды от друзей" name="FSWLWhitelistFriends" />
|
||||
<check_box label="Автоматически применять настройки окружающей среды от групп" name="FSWLWhitelistGroups" />
|
||||
<check_box label="Автоматически применять настройки окружающей среды от любого участка" name="FSWLWhitelistAll" />
|
||||
<text name="could_texture_text">
|
||||
Текстуры облаков:
|
||||
</text>
|
||||
<combo_box name="cloud_combo" tool_tip="Выберите текстуру, которая вам нравится" />
|
||||
</panel>
|
||||
<panel label="Строить 1" name="BuildTab">
|
||||
<text name="text_box_objprams">
|
||||
|
|
|
|||
Loading…
Reference in New Issue