diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
| commit | 04e8d074b2f21438b3f9c463a387c964cd5b6961 (patch) | |
| tree | c95b5bee3fd31fc66b0055c9635f5d8369cbd5e6 /indra/newview/skins/default/xui/tr/floater_env_settings.xml | |
| parent | 7bee4b58ff1e36ca39abc090991833c43c8903cc (diff) | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
Diffstat (limited to 'indra/newview/skins/default/xui/tr/floater_env_settings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/tr/floater_env_settings.xml | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/indra/newview/skins/default/xui/tr/floater_env_settings.xml b/indra/newview/skins/default/xui/tr/floater_env_settings.xml deleted file mode 100644 index d53629f6fe..0000000000 --- a/indra/newview/skins/default/xui/tr/floater_env_settings.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Environment Editor Floater" title="ÇEVRE DÜZENLEYİCİ"> - <floater.string name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text name="EnvTimeText"> - Günün Saati - </text> - <text name="EnvTimeText2"> - 12:00 PM - </text> - <text name="EnvCloudText"> - Bulut Örtüsü - </text> - <text name="EnvWaterColorText"> - Su Rengi - </text> - <color_swatch name="EnvWaterColor" tool_tip="Renk seçiciyi açmak için tıklayın"/> - <text name="EnvWaterFogText"> - Su Sisi - </text> - <button label="Gayrimenkul Saati Kullan" name="EnvUseEstateTimeButton"/> - <button label="Gelişmiş Gökyüzü" name="EnvAdvancedSkyButton"/> - <button label="Gelişmiş Su" name="EnvAdvancedWaterButton"/> -</floater> |