diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ed15b06557..45be3a8d23 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -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
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bfc222380b..03edfc7788 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -19767,5 +19767,18 @@ Change of this parameter will affect the layout of buttons in notification toast
1
+ FSLastSearchTab
+
diff --git a/indra/newview/fsfloatersearchlegacy.cpp b/indra/newview/fsfloatersearch.cpp
similarity index 99%
rename from indra/newview/fsfloatersearchlegacy.cpp
rename to indra/newview/fsfloatersearch.cpp
index 43b7f12d9b..1e6de33333 100644
--- a/indra/newview/fsfloatersearchlegacy.cpp
+++ b/indra/newview/fsfloatersearch.cpp
@@ -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("ls_tabs")->getCurrentPanelIndex());
+}
+
BOOL FSFloaterSearch::postBuild()
{
LLTabContainer* tabs = getChild("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;
}
diff --git a/indra/newview/fsfloatersearchlegacy.h b/indra/newview/fsfloatersearch.h
similarity index 99%
rename from indra/newview/fsfloatersearchlegacy.h
rename to indra/newview/fsfloatersearch.h
index db81fbdcd1..3ce8aa5ead 100644
--- a/indra/newview/fsfloatersearchlegacy.h
+++ b/indra/newview/fsfloatersearch.h
@@ -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;
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index c9db8549c7..cd08007404 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -37,7 +37,7 @@
#include "llagent.h"
#include "llcommandhandler.h" // secondlife:///app/... support
// FIRE-6310 - Legacy Search
-#include "fsfloatersearchlegacy.h"
+#include "fsfloatersearch.h"
#include "llviewerfloaterreg.h"
//
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 99c06c8c40..6d332621a9 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -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"
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 316865cf29..1f7d29b0bb 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -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);
LLFloaterReg::add("rlv_behaviours", "floater_rlv_behaviours.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
LLFloaterReg::add("rlv_locks", "floater_rlv_locks.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
- LLFloaterReg::add("search_legacy", "floater_fs_search_legacy.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
+ LLFloaterReg::add("search_legacy", "floater_fs_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
LLFloaterReg::add("search_replace", "floater_search_replace.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
LLFloaterReg::add("secondary_inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build);
diff --git a/indra/newview/skins/default/xui/de/floater_fs_search_legacy.xml b/indra/newview/skins/default/xui/de/floater_fs_search.xml
similarity index 100%
rename from indra/newview/skins/default/xui/de/floater_fs_search_legacy.xml
rename to indra/newview/skins/default/xui/de/floater_fs_search.xml
diff --git a/indra/newview/skins/default/xui/en/floater_fs_search_legacy.xml b/indra/newview/skins/default/xui/en/floater_fs_search.xml
similarity index 99%
rename from indra/newview/skins/default/xui/en/floater_fs_search_legacy.xml
rename to indra/newview/skins/default/xui/en/floater_fs_search.xml
index 3944aa1010..9d1e3920b3 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_search_legacy.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_search.xml
@@ -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"
diff --git a/indra/newview/skins/default/xui/es/floater_fs_search_legacy.xml b/indra/newview/skins/default/xui/es/floater_fs_search.xml
similarity index 100%
rename from indra/newview/skins/default/xui/es/floater_fs_search_legacy.xml
rename to indra/newview/skins/default/xui/es/floater_fs_search.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_fs_search_legacy.xml b/indra/newview/skins/default/xui/pl/floater_fs_search.xml
similarity index 94%
rename from indra/newview/skins/default/xui/pl/floater_fs_search_legacy.xml
rename to indra/newview/skins/default/xui/pl/floater_fs_search.xml
index ff7930a8f1..68fab7fb5d 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_search_legacy.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_search.xml
@@ -1,5 +1,5 @@
-
+
Miejsce: [LOCATION]
@@ -28,13 +28,13 @@
Opłata wstępu: [COVERCHARGE]
+
-
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index e0624fbb57..f0d81293de 100644
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -194,7 +194,6 @@