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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

master
Ansariel 2023-07-17 23:20:50 +02:00
parent 82e80b7726 7a77145cd3
commit 6fdfa1c025
20 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/lltexteditor.cpp
View File

@ -1915,7 +1915,10 @@ void LLTextEditor::unindentLineBeforeCloseBrace()
LLWString text = getWText();
if( ' ' == text[ mCursorPos - 1 ] )
{
S32 line = getLineNumFromDocIndex(mCursorPos, false);
// <FS:Zi> FIRE-19959: Fix unindent after } when a previous line had a word wrap
//S32 line = getLineNumFromDocIndex(mCursorPos, false);
S32 line = getLineNumFromDocIndex(mCursorPos, true);
// </FS:Zi>
S32 line_start = getLineStart(line);
// Jump over spaces in the current line

2
indra/newview/fsareasearch.cpp
View File

@ -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;

2
indra/newview/fsdata.cpp
View File

@ -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());

1
indra/newview/llviewerregion.cpp
View File

@ -106,6 +106,7 @@
const S32 MAX_CAP_REQUEST_ATTEMPTS = 30;
const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
bool LLViewerRegion::sFSAreaSearchActive = false; // <FS:Beq/> FIRE-32688 Area Search improvements
BOOL LLViewerRegion::sVOCacheCullingEnabled = FALSE;
S32 LLViewerRegion::sLastCameraUpdated = 0;
S32 LLViewerRegion::sNewObjectCreationThrottle = -1;

1
indra/newview/llviewerregion.h
View File

@ -478,6 +478,7 @@ public:
std::vector<U32> mMapAvatars;
std::vector<LLUUID> mMapAvatarIDs;
static bool sFSAreaSearchActive; // <FS:Beq/> FIRE-32688 Area Search improvements
static BOOL sVOCacheCullingEnabled; //vo cache culling enabled or not.
static S32 sLastCameraUpdated;

11
indra/newview/llvocache.cpp
View File

@ -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; } // <FS:Beq/> 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);
// <FS:Beq> FIRE-32688 Area Search improvements
// do_occlusion && use_object_cache_occlusion);
do_occlusion && use_object_cache_occlusion && !LLViewerRegion::sFSAreaSearchActive);
// </FS:Beq>
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,
// <FS:Beq> 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,
// </FS:Beq>
LLVOCacheEntry::getSquaredPixelThreshold(mFrontCull), this);
culler.traverse(mOctree);

BIN
indra/newview/skins/default/textures/icons/radar_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

2
indra/newview/skins/default/xui/az/strings.xml
View File

@ -52,7 +52,7 @@ Siz [REGION] regionundasınız
</string>
<string name="AboutSystem">
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]

2
indra/newview/skins/default/xui/de/strings.xml
View File

@ -52,7 +52,7 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
</string>
<string name="AboutSystem">
CPU: [CPU]
Speicher: [MEMORY_MB] MB
Speicher: [MEMORY_MB] MB (Verwendet: [USED_RAM] MB)
Parallelität: [CONCURRENCY]
Betriebssystemversion: [OS_VERSION]
Grafikkartenhersteller: [GRAPHICS_CARD_VENDOR]

2
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
View File

@ -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"

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -50,7 +50,7 @@ You are in [REGION]
and this info sometimes gets sent to support. -->
<string name="AboutSystem">
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]

3
indra/newview/skins/default/xui/es/strings.xml
View File

@ -49,7 +49,8 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
</string>
<string name="AboutSystem">
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]

3
indra/newview/skins/default/xui/fr/strings.xml
View File

@ -49,7 +49,8 @@ Vous êtes à [REGION]
</string>
<string name="AboutSystem">
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]

2
indra/newview/skins/default/xui/it/strings.xml
View File

@ -41,7 +41,7 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
</string>
<string name="AboutSystem">
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]

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

@ -41,7 +41,7 @@ Położenie: [REGION]
</string>
<string name="AboutSystem">
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]

3
indra/newview/skins/default/xui/pt/strings.xml
View File

@ -41,7 +41,8 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
</string>
<string name="AboutSystem">
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]

2
indra/newview/skins/default/xui/ru/strings.xml
View File

@ -61,7 +61,7 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
</string>
<string name="AboutSystem">
Процессор: [CPU]
Память RAM: [MEMORY_MB] МБ
Память RAM: [MEMORY_MB] МБ (Использовал: [USED_RAM] MB)
Потоки декодирования изображений: [CONCURRENCY]
Версия ОС: [OS_VERSION]
Производитель видеокарты: [GRAPHICS_CARD_VENDOR]

3
indra/newview/skins/default/xui/tr/strings.xml
View File

@ -53,7 +53,8 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
</string>
<string name="AboutSystem">
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]

3
indra/newview/skins/default/xui/zh/strings.xml
View File

@ -53,7 +53,8 @@
</string>
<string name="AboutSystem">
CPU：[CPU]
記憶體：[MEMORY_MB] MB
記憶體：[MEMORY_MB] MB (Used: [USED_RAM] MB)
Concurrency: [CONCURRENCY]
作業系統版本：[OS_VERSION]
顯示卡供應商：[GRAPHICS_CARD_VENDOR]
顯示卡：[GRAPHICS_CARD]

4
requirements.txt
View File

@ -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
autobuild>=3.9.1