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

Merge

meow-7.2.2
Ansariel 2013-01-19 22:55:52 +01:00
parent 5f6efbf8c8 0e83b83953
commit 12dc7a67a3
14 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/CMakeLists.txt
View File

@ -118,7 +118,7 @@ set(viewer_SOURCE_FILES
fsfloatergroup.cpp
fsfloaterplacedetails.cpp
fsfloaterprofile.cpp
fsfloatersearchlegacy.cpp
fsfloatersearch.cpp
fsfloaterteleporthistory.cpp
fsfloaterwsassetblacklist.cpp
fsgrouptitles.cpp
@ -773,7 +773,7 @@ set(viewer_HEADER_FILES
fsfloatergroup.h
fsfloaterplacedetails.h
fsfloaterprofile.h
fsfloatersearchlegacy.h
fsfloatersearch.h
fsfloaterteleporthistory.h
fsfloaterwsassetblacklist.h
fsgridhandler.h

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

@ -19767,5 +19767,18 @@ Change of this parameter will affect the layout of buttons in notification toast
<real>1</real>
</map>
<!-- </FS:Cron> -->
<key>FSLastSearchTab</key>
<map>
<key>Comment</key>
<string>Last selected tab in search window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
<key>Backup</key>
<integer>0</integer>
</map>
</map>
</llsd>

11
indra/newview/fsfloatersearchlegacy.cpp → indra/newview/fsfloatersearch.cpp
View File

@ -27,7 +27,7 @@
#include "llviewerprecompiledheaders.h"
#include "fsfloatersearchlegacy.h"
#include "fsfloatersearch.h"
#include "llagent.h"
#include "llavatarname.h"
#include "llavatarnamecache.h"
@ -304,6 +304,12 @@ void FSFloaterSearch::onOpen(const LLSD& key)
panel_classifieds->onSearchPanelOpen(this);
}
//virtual
void FSFloaterSearch::onClose(bool app_quitting)
{
gSavedSettings.setS32("FSLastSearchTab", getChild<LLTabContainer>("ls_tabs")->getCurrentPanelIndex());
}
BOOL FSFloaterSearch::postBuild()
{
LLTabContainer* tabs = getChild<LLTabContainer>("ls_tabs");
@ -334,7 +340,6 @@ BOOL FSFloaterSearch::postBuild()
mDetailsPanel->setVisible(false);
mHasSelection = false;
/// Disable websearch on OpenSim because most OpenSim grids don't have one and the ones that do
/// suck even more than LL's. (Scary but true!)
#ifdef HAS_OPENSIM_SUPPORT
@ -350,6 +355,8 @@ BOOL FSFloaterSearch::postBuild()
}
}
#endif // HAS_OPENSIM_SUPPORT
if (!tabs->selectTab(gSavedSettings.getS32("FSLastSearchTab")))
tabs->selectFirstTab();
return TRUE;
}

1
indra/newview/fsfloatersearchlegacy.h → indra/newview/fsfloatersearch.h
View File

@ -73,6 +73,7 @@ public:
void setLoadingProgress(bool started);
static std::string filterShortWords(std::string query_string);
private:
virtual void onClose(bool app_quitting);
const LLUUID& getSelectedID() { return mSelectedID; }
LLVector3d mParcelGlobal;
LLUUID mSelectedID;

2
indra/newview/lleventnotifier.cpp
View File

@ -37,7 +37,7 @@
#include "llagent.h"
#include "llcommandhandler.h" // secondlife:///app/... support
// <FS:CR> FIRE-6310 - Legacy Search
#include "fsfloatersearchlegacy.h"
#include "fsfloatersearch.h"
#include "llviewerfloaterreg.h"
// </FS:CR>

2
indra/newview/llstartup.cpp
View File

@ -207,7 +207,7 @@
#include "fscontactsfloater.h"
#include "fsdata.h"
#include "fsfloatersearchlegacy.h"
#include "fsfloatersearch.h"
#include "fslslbridge.h"
#include "fswsassetblacklist.h"
#include "llfloatersidepanelcontainer.h"

4
indra/newview/llviewerfloaterreg.cpp
View File

@ -153,7 +153,7 @@
#include "fsfloatergroup.h"
#include "fsfloaterplacedetails.h"
#include "fsfloaterprofile.h"
#include "fsfloatersearchlegacy.h"
#include "fsfloatersearch.h"
#include "fsfloaterteleporthistory.h"
#include "fsfloaterwsassetblacklist.h"
#include "fsgrouptitles.h"
@ -382,7 +382,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("quickprefs", "floater_quickprefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FloaterQuickPrefs>);
LLFloaterReg::add("rlv_behaviours", "floater_rlv_behaviours.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<RlvFloaterBehaviours>);
LLFloaterReg::add("rlv_locks", "floater_rlv_locks.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<RlvFloaterLocks>);
LLFloaterReg::add("search_legacy", "floater_fs_search_legacy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterSearch>);
LLFloaterReg::add("search_legacy", "floater_fs_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterSearch>);
LLFloaterReg::add("search_replace", "floater_search_replace.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearchReplace>);
LLFloaterReg::add("secondary_inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptRecover>);

0
indra/newview/skins/default/xui/de/floater_fs_search_legacy.xml → indra/newview/skins/default/xui/de/floater_fs_search.xml
View File

2
indra/newview/skins/default/xui/en/floater_fs_search_legacy.xml → indra/newview/skins/default/xui/en/floater_fs_search.xml
View File

@ -8,7 +8,7 @@
legacy_header_height="0"
min_height="590"
min_width="660"
name="floater_fs_search_legacy"
name="floater_fs_search"
positioning="centered"
save_rect="true"
single_instance="true"

0
indra/newview/skins/default/xui/es/floater_fs_search_legacy.xml → indra/newview/skins/default/xui/es/floater_fs_search.xml
View File

4
indra/newview/skins/default/xui/pl/floater_fs_search_legacy.xml → indra/newview/skins/default/xui/pl/floater_fs_search.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_fs_search_legacy" title="Klasyczne wyszukiwanie">
<floater name="floater_fs_search_legacy" title="Wyszukiwarka Firestorma">
<floater.string name="string.location">
Miejsce: [LOCATION]
</floater.string>
@ -28,13 +28,13 @@
Opłata wstępu: [COVERCHARGE]
</floater.string>
<tab_container name="ls_tabs">
<panel label="Sieć" name="panel_ls_web" />
<panel label="Ludzie" name="panel_ls_people" />
<panel label="Grupy" name="panel_ls_groups" />
<panel label="Miejsca" name="panel_ls_places" />
<panel label="Sprzedaż ziemi" name="panel_ls_land" />
<panel label="Wydarzenia" name="panel_ls_events" />
<panel label="Reklamy" name="panel_ls_classifieds" />
<!-- <panel label="Sieć" name="panel_ls_web" /> -->
</tab_container>
<panel name="panel_ls_details">
<text_editor name="title" value="Nazwa niezdefiniowana" />

1
indra/newview/skins/default/xui/pl/menu_viewer.xml
View File

@ -194,7 +194,6 @@
</menu>
<menu label="Zawartość" name="Content">
<menu_item_check label="Wyszukiwarka" name="Search"/>
<menu_item_check label="Klasyczne szukanie" name="Legacy Search"/>
<menu_item_call label="Marketplace Second Life" name="SL Marketplace"/>
<menu_item_call label="Dane z rynku L$" name="LindenXchange"/>
<menu_item_call label="Biblioteka skryptów" name="Script Library"/>

2
indra/newview/skins/default/xui/pl/panel_fs_search_legacy_web.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel label="Sieć" name="panel_ls_web" />

6
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -4646,9 +4646,6 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
<string name="Command_Mouselook_Label">
Tryb pierwszoosobowy
</string>
<string name="Command_Legacy_Search_Label">
Klasyczne szukanie
</string>
<string name="Command_AboutLand_Tooltip">
Informacje o miejscu, które odwiedzasz
</string>
@ -4781,9 +4778,6 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
<string name="Command_Fly_Tooltip">
Włącz/wyłącz tryb latania
</string>
<string name="Command_Legacy_Search_Tooltip">
Znajdź miejsca, grupy oraz ludzi używając klasycznego sposobu wyszukiwania
</string>
<string name="Retain%">
%Zachowania
</string>