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

merge latest VMP updates

master
Oz Linden 2017-07-11 14:24:29 -04:00
parent ffb5a17a01 663e920fc3
commit dd64b8ea04
25 changed files with 61 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -3150,9 +3150,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>425fc3c3ab386ba39a43e4648f917fc7</string>
<string>83237f66d1406285b35a55e3f3691a9e</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7011/25711/viewer_manager-1.0.507000-darwin64-507000.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7193/26740/viewer_manager-1.0.507182-darwin64-507182.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -3174,9 +3174,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c448493f1afd7eb93160c4cb3fc9ef57</string>
<string>ce2aa248510bc233f3b0c35572641957</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7012/25717/viewer_manager-1.0.507000-windows-507000.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/7194/26746/viewer_manager-1.0.507182-windows-507182.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -3187,7 +3187,7 @@
<key>source_type</key>
<string>hg</string>
<key>version</key>
<string>1.0.507000</string>
<string>1.0.507182</string>
</map>
<key>vlc-bin</key>
<map>

2
indra/newview/app_settings/cmd_line.xml
View File

@ -81,7 +81,7 @@
<key>map-to</key>
<string>PacketDropPercentage</string>
</map>
<key>god</key>
<map>
<key>desc</key>

2
indra/newview/installers/windows/installer_template.nsi
View File

@ -404,6 +404,8 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"
DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"
# BUG-2707 Remove entry that disabled SEHOP
DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$INSTEXE"
DeleteRegKey HKEY_CLASSES_ROOT "Applications\$INSTEXE"
DeleteRegKey HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}"
# Clean up shortcuts
Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

98
indra/newview/llfeaturemanager.cpp
View File

@ -403,70 +403,78 @@ F32 gpu_benchmark();
bool LLFeatureManager::loadGPUClass()
{
//get memory bandwidth from benchmark
F32 gbps = gpu_benchmark();
if (gbps < 0.f)
{ //couldn't bench, use GLVersion
#if LL_DARWIN
//GLVersion is misleading on OSX, just default to class 3 if we can't bench
if (!gSavedSettings.getBOOL("SkipBenchmark"))
{
//get memory bandwidth from benchmark
F32 gbps = gpu_benchmark();
if (gbps < 0.f)
{ //couldn't bench, use GLVersion
#if LL_DARWIN
//GLVersion is misleading on OSX, just default to class 3 if we can't bench
LL_WARNS() << "Unable to get an accurate benchmark; defaulting to class 3" << LL_ENDL;
mGPUClass = GPU_CLASS_3;
#else
if (gGLManager.mGLVersion < 2.f)
mGPUClass = GPU_CLASS_3;
#else
if (gGLManager.mGLVersion < 2.f)
{
mGPUClass = GPU_CLASS_0;
}
else if (gGLManager.mGLVersion < 3.f)
{
mGPUClass = GPU_CLASS_1;
}
else if (gGLManager.mGLVersion < 3.3f)
{
mGPUClass = GPU_CLASS_2;
}
else if (gGLManager.mGLVersion < 4.f)
{
mGPUClass = GPU_CLASS_3;
}
else
{
mGPUClass = GPU_CLASS_4;
}
#endif
}
else if (gGLManager.mGLVersion <= 2.f)
{
mGPUClass = GPU_CLASS_0;
}
else if (gGLManager.mGLVersion < 3.f)
else if (gGLManager.mGLVersion <= 3.f)
{
mGPUClass = GPU_CLASS_1;
}
else if (gGLManager.mGLVersion < 3.3f)
else if (gbps <= 5.f)
{
mGPUClass = GPU_CLASS_0;
}
else if (gbps <= 8.f)
{
mGPUClass = GPU_CLASS_1;
}
else if (gbps <= 16.f)
{
mGPUClass = GPU_CLASS_2;
}
else if (gGLManager.mGLVersion < 4.f)
else if (gbps <= 40.f)
{
mGPUClass = GPU_CLASS_3;
}
else
else if (gbps <= 80.f)
{
mGPUClass = GPU_CLASS_4;
}
#endif
}
else if (gGLManager.mGLVersion <= 2.f)
{
mGPUClass = GPU_CLASS_0;
}
else if (gGLManager.mGLVersion <= 3.f)
else
{
mGPUClass = GPU_CLASS_5;
}
} //end if benchmark
else
{
//setting says don't benchmark MAINT-7558
mGPUClass = GPU_CLASS_1;
}
else if (gbps <= 5.f)
{
mGPUClass = GPU_CLASS_0;
}
else if (gbps <= 8.f)
{
mGPUClass = GPU_CLASS_1;
}
else if (gbps <= 16.f)
{
mGPUClass = GPU_CLASS_2;
}
else if (gbps <= 40.f)
{
mGPUClass = GPU_CLASS_3;
}
else if (gbps <= 80.f)
{
mGPUClass = GPU_CLASS_4;
}
else
{
mGPUClass = GPU_CLASS_5;
}
// defaults
mGPUString = gGLManager.getRawGLString();

1
indra/newview/skins/default/xui/de/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
<menu_item_call label="Fehler melden" name="Report Bug"/>
<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Nach Updates suchen" name="Check for Updates"/>
</menu>
<menu_item_check label="Debug-Menü anzeigen" name="Show Debug Menu"/>
<menu label="Debug" name="Debug">

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

@ -183,7 +183,6 @@
<menu_item_call label="Fehler melden" name="Report Bug"/>
<menu_item_call label="Rempler, Stöße &amp; Schläge" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Nach Updates suchen" name="Check for Updates"/>
</menu>
<menu label="Erweitert" name="Advanced">
<menu_item_call label="Textur neu laden" name="Rebake Texture"/>

8
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -43,14 +43,6 @@
top_pad="5"
height="25"
width="180" />
<button
follows="left|top"
label="Check for updates"
name="update_btn"
left_pad="70"
top_delta="0"
height="25"
width="180" />
</panel>
<panel
border="true"

6
indra/newview/skins/default/xui/en/menu_login.xml
View File

@ -130,12 +130,6 @@
function="Floater.Show"
parameter="sl_about" />
</menu_item_call>
<menu_item_call
label="Check for Updates"
name="Check for Updates">
<menu_item_call.on_click
function="Advanced.CheckViewerUpdates"/>
</menu_item_call>
</menu>
<menu_item_check
label="Show Debug Menu"

6
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -1471,12 +1471,6 @@
function="Floater.Show"
parameter="sl_about" />
</menu_item_call>
<menu_item_call
label="Check for Updates"
name="Check for Updates">
<menu_item_call.on_click
function="Advanced.CheckViewerUpdates"/>
</menu_item_call>
</menu>
<menu
create_jump_keys="true"

1
indra/newview/skins/default/xui/es/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Informar de un fallo" name="Report Bug"/>
<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Buscar actualizaciones" name="Check for Updates"/>
</menu>
<menu_item_check label="Mostrar el menú &apos;Debug&apos;" name="Show Debug Menu"/>
<menu label="Depurar" name="Debug">

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

@ -183,7 +183,6 @@
<menu_item_call label="Informar de un fallo" name="Report Bug"/>
<menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Buscar actualizaciones" name="Check for Updates"/>
</menu>
<menu label="Avanzado" name="Advanced">
<menu_item_call label="Recargar las texturas" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/fr/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Signaler un bug" name="Report Bug"/>
<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Rechercher des mises à jour" name="Check for Updates"/>
</menu>
<menu_item_check label="Afficher le menu de débogage" name="Show Debug Menu"/>
<menu label="Débogage" name="Debug">

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

@ -183,7 +183,6 @@
<menu_item_call label="Signaler un bug" name="Report Bug"/>
<menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Rechercher des mises à jour" name="Check for Updates"/>
</menu>
<menu label="Avancé" name="Advanced">
<menu_item_call label="Refixer les textures" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/it/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
<menu_item_call label="Segnala bug" name="Report Bug"/>
<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Cerca aggiornamenti" name="Check for Updates"/>
</menu>
<menu_item_check label="Mostra menu Debug" name="Show Debug Menu"/>
<menu label="Debug" name="Debug">

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

@ -183,7 +183,6 @@
<menu_item_call label="Segnala bug" name="Report Bug"/>
<menu_item_call label="Urti, spinte e contatti" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Cerca aggiornamenti" name="Check for Updates"/>
</menu>
<menu label="Avanzate" name="Advanced">
<menu_item_call label="Ridisegna le texture" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/ja/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
<menu_item_call label="バグを報告する" name="Report Bug"/>
<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
<menu_item_call label="アップデートを確認" name="Check for Updates"/>
</menu>
<menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu"/>
<menu label="デバッグ" name="Debug">

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

@ -183,7 +183,6 @@
<menu_item_call label="バグを報告する" name="Report Bug"/>
<menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
<menu_item_call label="アップデートを確認" name="Check for Updates"/>
</menu>
<menu label="アドバンス" name="Advanced">
<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/pt/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Relatar bug" name="Report Bug"/>
<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Verificar atualizações" name="Check for Updates"/>
</menu>
<menu_item_check label="Exibir menu de depuração" name="Show Debug Menu"/>
<menu label="Depurar" name="Debug">

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

@ -183,7 +183,6 @@
<menu_item_call label="Relatar bug" name="Report Bug"/>
<menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Verificar atualizações" name="Check for Updates"/>
</menu>
<menu label="Avançado" name="Advanced">
<menu_item_call label="Recarregar texturas" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/ru/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Проверить наличие обновлений" name="Check for Updates"/>
</menu>
<menu_item_check label="Показать меню отладки" name="Show Debug Menu"/>
<menu label="Отладка" name="Debug">

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

@ -180,7 +180,6 @@
<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
<menu_item_call label="Столкновения, толчки и удары" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
<menu_item_call label="Проверить наличие обновлений" name="Check for Updates"/>
</menu>
<menu label="Дополнительно" name="Advanced">
<menu_item_call label="Обновить текстуры" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/tr/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="[SECOND_LIFE] Bloklar" name="Second Life Blogs"/>
<menu_item_call label="Hata Bildir" name="Report Bug"/>
<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
<menu_item_call label="Güncellemeleri Kontrol Et" name="Check for Updates"/>
</menu>
<menu_item_check label="Hata Ayıklama Menüsünü Göster" name="Show Debug Menu"/>
<menu label="Hata ayıkla" name="Debug">

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

@ -181,7 +181,6 @@
<menu_item_call label="Hata Bildir" name="Report Bug"/>
<menu_item_call label="Toslamalar, İtmeler ve Vurmalar" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
<menu_item_call label="Güncellemeleri Kontrol Et" name="Check for Updates"/>
</menu>
<menu label="Gelişmiş" name="Advanced">
<menu_item_call label="Dokuları Tekrar Kaydet" name="Rebake Texture"/>

1
indra/newview/skins/default/xui/zh/menu_login.xml
View File

@ -16,7 +16,6 @@
<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
<menu_item_call label="回報錯誤" name="Report Bug"/>
<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
<menu_item_call label="查詢是否有新版" name="Check for Updates"/>
</menu>
<menu_item_check label="顯示除錯選單" name="Show Debug Menu"/>
<menu label="除錯" name="Debug">

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

@ -181,7 +181,6 @@
<menu_item_call label="回報臭蟲" name="Report Bug"/>
<menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp;amp; Hits"/>
<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
<menu_item_call label="查詢是否有新版" name="Check for Updates"/>
</menu>
<menu label="進階" name="Advanced">
<menu_item_call label="重新產出材質" name="Rebake Texture"/>