diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index c208c0006b..b03e53a643 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -1915,7 +1915,10 @@ void LLTextEditor::unindentLineBeforeCloseBrace()
LLWString text = getWText();
if( ' ' == text[ mCursorPos - 1 ] )
{
- S32 line = getLineNumFromDocIndex(mCursorPos, false);
+ // FIRE-19959: Fix unindent after } when a previous line had a word wrap
+ //S32 line = getLineNumFromDocIndex(mCursorPos, false);
+ S32 line = getLineNumFromDocIndex(mCursorPos, true);
+ //
S32 line_start = getLineStart(line);
// Jump over spaces in the current line
diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp
index b3e107eb5e..b81a20454f 100644
--- a/indra/newview/fsareasearch.cpp
+++ b/indra/newview/fsareasearch.cpp
@@ -173,6 +173,7 @@ FSAreaSearch::FSAreaSearch(const LLSD& key) :
mRequestNeedsSent(false),
mRlvBehaviorCallbackConnection()
{
+ LLViewerRegion::sFSAreaSearchActive = true;
mFactoryMap["area_search_list_panel"] = LLCallbackMap(createPanelList, this);
mFactoryMap["area_search_find_panel"] = LLCallbackMap(createPanelFind, this);
mFactoryMap["area_search_filter_panel"] = LLCallbackMap(createPanelFilter, this);
@@ -188,6 +189,7 @@ FSAreaSearch::FSAreaSearch(const LLSD& key) :
FSAreaSearch::~FSAreaSearch()
{
+ LLViewerRegion::sFSAreaSearchActive = false;
if (!gIdleCallbacks.deleteFunction(idle, this))
{
LL_WARNS("FSAreaSearch") << "FSAreaSearch::~FSAreaSearch() failed to delete callback" << LL_ENDL;
diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index f56772ea3d..ba78bafaf2 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -1025,7 +1025,7 @@ LLSD FSData::getSystemInfo()
sysinfo1 += llformat("%s\n\n", info["SERVER_VERSION"].asString().c_str());
sysinfo1 += llformat("CPU: %s\n", info["CPU"].asString().c_str());
- sysinfo1 += llformat("Memory: %d MB\n", info["MEMORY_MB"].asInteger());
+ sysinfo1 += llformat("Memory: %d MB (Used: %d MB)\n", info["MEMORY_MB"].asInteger(), info["USED_RAM"].asInteger());
sysinfo1 += llformat("OS: %s\n", info["OS_VERSION"].asString().c_str());
sysinfo1 += llformat("Graphics Card Vendor: %s\n", info["GRAPHICS_CARD_VENDOR"].asString().c_str());
sysinfo1 += llformat("Graphics Card: %s\n", info["GRAPHICS_CARD"].asString().c_str());
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index a719294007..5fd65c3405 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -106,6 +106,7 @@
const S32 MAX_CAP_REQUEST_ATTEMPTS = 30;
const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
+bool LLViewerRegion::sFSAreaSearchActive = false; // FIRE-32688 Area Search improvements
BOOL LLViewerRegion::sVOCacheCullingEnabled = FALSE;
S32 LLViewerRegion::sLastCameraUpdated = 0;
S32 LLViewerRegion::sNewObjectCreationThrottle = -1;
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 312b792b4f..786b530ab9 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -478,6 +478,7 @@ public:
std::vector mMapAvatars;
std::vector mMapAvatarIDs;
+ static bool sFSAreaSearchActive; // FIRE-32688 Area Search improvements
static BOOL sVOCacheCullingEnabled; //vo cache culling enabled or not.
static S32 sLastCameraUpdated;
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 2a2bbd09a9..be7b2b1453 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -432,6 +432,7 @@ F32 LLVOCacheEntry::getSquaredPixelThreshold(bool is_front)
bool LLVOCacheEntry::isAnyVisible(const LLVector4a& camera_origin, const LLVector4a& local_camera_origin, F32 dist_threshold)
{
+ if( LLViewerRegion::sFSAreaSearchActive ) { return true; } // FIRE-32688 Area Search improvements
LLOcclusionCullingGroup* group = (LLOcclusionCullingGroup*)getGroup();
if(!group)
{
@@ -928,7 +929,10 @@ S32 LLVOCachePartition::cull(LLCamera &camera, bool do_occlusion)
//process back objects selection
selectBackObjects(camera, LLVOCacheEntry::getSquaredPixelThreshold(mFrontCull),
- do_occlusion && use_object_cache_occlusion);
+ // FIRE-32688 Area Search improvements
+ // do_occlusion && use_object_cache_occlusion);
+ do_occlusion && use_object_cache_occlusion && !LLViewerRegion::sFSAreaSearchActive);
+ //
return 0; //nothing changed, reduce frequency of culling
}
}
@@ -942,7 +946,10 @@ S32 LLVOCachePartition::cull(LLCamera &camera, bool do_occlusion)
camera.calcRegionFrustumPlanes(region_agent, gAgentCamera.mDrawDistance);
mFrontCull = TRUE;
- LLVOCacheOctreeCull culler(&camera, mRegionp, region_agent, do_occlusion && use_object_cache_occlusion,
+ // FIRE-32688 Area Search improvements
+ // LLVOCacheOctreeCull culler(&camera, mRegionp, region_agent, do_occlusion && use_object_cache_occlusion,
+ LLVOCacheOctreeCull culler(&camera, mRegionp, region_agent, do_occlusion && use_object_cache_occlusion && !LLViewerRegion::sFSAreaSearchActive,
+ //
LLVOCacheEntry::getSquaredPixelThreshold(mFrontCull), this);
culler.traverse(mOctree);
diff --git a/indra/newview/skins/default/textures/icons/radar_b.png b/indra/newview/skins/default/textures/icons/radar_b.png
new file mode 100644
index 0000000000..df91915f76
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/radar_b.png differ
diff --git a/indra/newview/skins/default/xui/az/strings.xml b/indra/newview/skins/default/xui/az/strings.xml
index 08a5b5e6a4..52447aef6d 100644
--- a/indra/newview/skins/default/xui/az/strings.xml
+++ b/indra/newview/skins/default/xui/az/strings.xml
@@ -52,7 +52,7 @@ Siz [REGION] regionundasınız
Prosesor: [CPU]
-RAM: [MEMORY_MB] MB
+RAM: [MEMORY_MB] MB (İstifadə olunmuş yaddaş: [USED_RAM] MB)
Şəkilləri dekodlaşdırma threadləri: [CONCURRENCY]
OS versiyası: [OS_VERSION]
Grafik kartının istehsalçısı: [GRAPHICS_CARD_VENDOR]
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index b10301447a..4dea831a54 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -52,7 +52,7 @@ SLURL: <nolink>[SLURL]</nolink>
CPU: [CPU]
-Speicher: [MEMORY_MB] MB
+Speicher: [MEMORY_MB] MB (Verwendet: [USED_RAM] MB)
Parallelität: [CONCURRENCY]
Betriebssystemversion: [OS_VERSION]
Grafikkartenhersteller: [GRAPHICS_CARD_VENDOR]
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 0d8d6e2b14..26aa3becb5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -1309,7 +1309,7 @@
label="FPS:"
label_width="30"
layout="topleft"
- max_val="120"
+ max_val="360"
min_val="15"
name="MaxFPS"
left_delta="240"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 928daf17f6..33158dc2de 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -50,7 +50,7 @@ You are in [REGION]
and this info sometimes gets sent to support. -->
CPU: [CPU]
-Memory: [MEMORY_MB] MB
+Memory: [MEMORY_MB] MB (Used: [USED_RAM] MB)
Concurrency: [CONCURRENCY]
OS Version: [OS_VERSION]
Graphics Card Vendor: [GRAPHICS_CARD_VENDOR]
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index f12e1004f5..50671bba7d 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -49,7 +49,8 @@ SLURL: <nolink>[SLURL]</nolink>
CPU: [CPU]
-Memoria: [MEMORY_MB] MB
+Memoria: [MEMORY_MB] MB (Memoria usada: [USED_RAM] MB)
+Concurrency: [CONCURRENCY]
Versión del Sistema Operativo: [OS_VERSION]
Fabricante de la tarjeta gráfica: [GRAPHICS_CARD_VENDOR]
Tarjeta gráfica: [GRAPHICS_CARD]
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 92102fbcfb..d18bd467c3 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -49,7 +49,8 @@ Vous êtes à [REGION]
CPU : [CPU]
-Mémoire : [MEMORY_MB] Mo
+Mémoire : [MEMORY_MB] Mo (Utilisée : [USED_RAM] Mo)
+Concurrence: [CONCURRENCY]
Version OS : [OS_VERSION]
Distributeur de cartes graphiques : [GRAPHICS_CARD_VENDOR]
Carte graphique : [GRAPHICS_CARD]
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f1cffee461..64e83cf0ee 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -41,7 +41,7 @@ SLURL: <nolink>[SLURL]</nolink>
Processore (CPU): [CPU]
-Memoria (Memory): [MEMORY_MB] MB
+Memoria (Memory): [MEMORY_MB] MB (Memoria utilizzata: [USED_RAM] MB)
Concurrency: [CONCURRENCY]
Versione SO (OS Version): [OS_VERSION]
Produttore scheda grafica (Graphics Card Vendor): [GRAPHICS_CARD_VENDOR]
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index bd8407958f..575257fac2 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -41,7 +41,7 @@ Położenie: [REGION]
Procesor (CPU): [CPU]
-Pamięć (Memory): [MEMORY_MB] MB
+Pamięć (Memory): [MEMORY_MB] MB (w użyciu: [USED_RAM] MB)
Wątki dekodowania obrazów (Concurrency): [CONCURRENCY]
System operacyjny (OS Version): [OS_VERSION]
Dostawca karty graficznej (Graphics Card Vendor): [GRAPHICS_CARD_VENDOR]
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 339f08788f..6d1192ec7a 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -41,7 +41,8 @@ SLURL: <nolink>[SLURL]</nolink>
CPU: [CPU]
-Memória: [MEMORY_MB] MBs
+Memória: [MEMORY_MB] MBs (Memória usada: [USED_RAM] MBs)
+Concurrency: [CONCURRENCY]
Versão OS: [OS_VERSION]
Placa de vídeo: [GRAPHICS_CARD_VENDOR]
Placa gráfica: [GRAPHICS_CARD]
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 3e62e731d8..fc178ecab0 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -61,7 +61,7 @@ SLURL: <nolink>[SLURL]</nolink>
Процессор: [CPU]
-Память RAM: [MEMORY_MB] МБ
+Память RAM: [MEMORY_MB] МБ (Использовал: [USED_RAM] MB)
Потоки декодирования изображений: [CONCURRENCY]
Версия ОС: [OS_VERSION]
Производитель видеокарты: [GRAPHICS_CARD_VENDOR]
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 775611a1aa..4a3575597b 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -53,7 +53,8 @@ SLURL: <nolink>[SLURL]</nolink>
CPU: [CPU]
-Bellek: [MEMORY_MB] MB
+Bellek: [MEMORY_MB] MB (Used: [USED_RAM] MB)
+Concurrency: [CONCURRENCY]
İşl. Sis. Sürümü: [OS_VERSION]
Grafik Kartı Üreticisi: [GRAPHICS_CARD_VENDOR]
Grafik Kartı: [GRAPHICS_CARD]
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index bde712a8b1..7ff5d55bcb 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -53,7 +53,8 @@
CPU：[CPU]
-記憶體：[MEMORY_MB] MB
+記憶體：[MEMORY_MB] MB (Used: [USED_RAM] MB)
+Concurrency: [CONCURRENCY]
作業系統版本：[OS_VERSION]
顯示卡供應商：[GRAPHICS_CARD_VENDOR]
顯示卡：[GRAPHICS_CARD]
diff --git a/requirements.txt b/requirements.txt
index 5ed33066fd..1c8fa7fcf0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,2 @@
llbase>=1.2.11
-autobuild>=3.9.1
-# git+https://github.com/FirestormViewer/autobuild-3.0#egg=autobuild
-# git+https://github.com/Nicky-D/autobuild@main_nd#egg=autobuild
\ No newline at end of file
+autobuild>=3.9.1
\ No newline at end of file