Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm

autobuild.xml

@@ -1280,9 +1280,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d9b763952986b176de253e804ffe16ee</string>
+              <string>68b1eae7b0f0b1c689f867ccc0045816</string>
               <key>url</key>
-              <string>file:///opt/firestorm/kdu-8.6-darwin64-252732257.tar.bz2</string>
+              <string>file:///opt/firestorm/kdu-8.6.1-darwin64-260220143.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1292,9 +1292,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>989865df0a7730ec89666e648916ddb1</string>
+              <string>b06b152529a216491b954bc91850de0c</string>
               <key>url</key>
-              <string>file:///opt/firestorm/kdu-8.6-linux64-252731650.tar.bz2</string>
+              <string>file:///opt/firestorm/kdu-8.6.1-linux64-260220142.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>
@@ -1304,9 +1304,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ab733beda1aa6b2b5ee756df57758846</string>
+              <string>7b042bef7b06f122ac9755c02ee40f7d</string>
               <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/kdu-8.6-windows64-252731650.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/kdu-8.6.1-windows64-260220142.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>

indra/cmake/LLKDU.cmake

@@ -43,5 +43,5 @@ if (USE_KDU)
           ${AUTOBUILD_INSTALL_DIR}/include/kdu
           ${LIBS_OPEN_DIR}/llkdu
           )
-  #target_compile_definitions(ll::kdu INTERFACE KDU_NO_THREADS=1) // <FS:Ansariel> Enable KDU internal threading
+  target_compile_definitions(ll::kdu INTERFACE KDU_NO_THREADS=1)
 endif (USE_KDU)

indra/llphysicsextensionsos/llconvexdecompositionvhacd.cpp

@@ -340,6 +340,12 @@ LLCDResult LLConvexDecompositionVHACD::executeStage(int stage)
         out_mesh.setVertices(ch.m_points);
         out_mesh.setIndices(ch.m_triangles);
 
+        if (!mBoundDecomp)
+        {
+            mVHACD->Clean();
+            return LLCD_NULL_PTR;
+        }
+
         mBoundDecomp->mDecomposedHulls.push_back(std::move(out_mesh));
     }
 

indra/newview/llfloatermodelpreview.cpp

@@ -327,14 +327,6 @@ bool LLFloaterModelPreview::postBuild()
 #endif // OPENSIM <FS:AW optional opensim support>
     // </Ansariel>
 
-// <FS:CR> Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok
-#if !LL_HAVOK
-    LLSD args;
-    args["FEATURE"] = getString("no_havok");
-    LLNotificationsUtil::add("NoHavok", args);
-#endif
-// </FS:CR>
-
     getChild<LLTextBox>("warning_message")->setTextArg("[VURL]", validate_url);
 
     mUploadBtn = getChild<LLButton>("ok_btn");

indra/newview/llfloaterpathfindingconsole.cpp

@@ -39,6 +39,7 @@
 #include "llfloaterpathfindinglinksets.h"
 #include "llfloaterreg.h"
 #include "llhandle.h"
+#include "llnotificationsutil.h" // <FS:TJ/>
 #include "llpanel.h"
 #include "llpathfindingnavmeshzone.h"
 #include "llpathfindingpathtool.h"
@@ -203,6 +204,12 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
     {
         setConsoleState(kConsoleStateLibraryNotImplemented);
         LL_WARNS() <<"Errror: cannot find pathing library implementation."<<LL_ENDL;
+
+        // <FS:TJ> Show an alert dialog if using a viewer without pathfinding view / test support
+        LLSD args;
+        args["FEATURE"] = getString("no_havok");
+        LLNotificationsUtil::add("NoHavok", args);
+        // </FS:TJ>
     }
     else
     {

indra/newview/llmodelpreview.cpp

@@ -3387,9 +3387,6 @@ void LLModelPreview::updateStatusMessages()
     //        physStatusIcon->setImage(img);
     //    }
     //}
-#if !LL_HAVOK
-    has_physics_error |= PhysicsError::NOHAVOK;
-#endif
 
     auto physStatusIcon = mFMP->getChild<LLIconCtrl>("physics_status_message_icon");
 
@@ -3424,12 +3421,6 @@ void LLModelPreview::updateStatusMessages()
             physStatusIcon->setImage(img);
         }
 // </FS:Beq>
-        else if (has_physics_error & PhysicsError::NOHAVOK)
-        {
-            mFMP->childSetValue("physics_status_message_text", mFMP->getString("phys_status_no_havok"));
-            LLUIImagePtr img = LLUI::getUIImage("ModelImport_Status_Warning");
-            physStatusIcon->setImage(img);
-        }
         else
         {
             // This should not happen

indra/newview/llviewermenu.cpp

@@ -6897,7 +6897,10 @@ class LLToolsEnablePathfindingView : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
     {
-        return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingViewEnabled();
+        // <FS:TJ> We still want the menu option to be enabled so we can warn the user when there is no Pathfinding support
+        //return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingViewEnabled();
+        return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
+        // </FS:TJ>
     }
 };
 

indra/newview/llviewertexture.cpp

@@ -1558,7 +1558,9 @@ bool LLViewerFetchedTexture::preCreateTexture(S32 usename/*= 0*/)
         // from local images, but this might become unsafe in case of changes to fetcher
         if (mBoostLevel == BOOST_PREVIEW)
         {
-            mRawImage->biasedScaleToPowerOfTwo(1024);
+            // A local file with a preview flag likely means mesh's texture upload
+            // which should follow normal upload scaling rules
+            mRawImage->biasedScaleToPowerOfTwo(LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT);
         }
         else
         { // leave black border, do not scale image content

indra/newview/skins/default/xui/az/floater_model_preview.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="Model yüklənməsi">
-  <string name="no_havok">fizikası olan mesh yüklənir</string>
   <string name="status_parse_error">Xəta: DAE faylının təhlilində problem var - Ətraflı məlumatlar üçün jurnalı baxın.</string>
   <string name="status_bind_shape_orientation">Xəbərdarlıq: Matrix formu standart olaraq X koordinatına uyğun deyil.</string>
   <string name="status_material_mismatch">Xəta: Modelin materialı standart modeldə yoxdur.</string>
@@ -24,7 +23,6 @@
   <string name="phys_status_vertex_limit_exceeded">Bəzi fiziki qabıqlar üçün vertex limiti aşıldı (256); Digər 'Analiz Metodu'nu sınayın.</string>
   <string name="phys_status_hull_limit_exceeded">Bəzi modellər qabığın limitini keçir (256); 'Sadələşdirmə'ni sınayın.</string>
   <string name="phys_status_degenerate_triangles">Mesh fizikası çox sıxdır və ya degenerativ üçbucaqları ehtiva edir. Həll etmək üçün Analiz/Sadələşdirmədən istifadə edin.</string>
-  <string name="phys_status_no_havok">Bu versiya Havok-u dəstəkləmir və fizikanı Second Life-a yükləmək üçün tövsiyə edilmir. Nəticələr gözlənilməz ola bilər.</string>
   <string name="phys_status_too_thin">0,5 m-dən kiçik bir və ya bir neçə ölçü, yalnız gövdəyə əsaslanan fiziki formalar (təhlil edilmiş) düzgün işləyəcək.</string>
   <string name="phys_status_unknown_error">Tanınmamış xəta tapıldı.</string>
   <string name="layer_all">Hamısı</string>

indra/newview/skins/default/xui/az/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Yol tapma önizləməsi/yoxlanması">
+    <floater.string name="no_havok">
+        Yol tapma önizləməsi/yoxlanması
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Yol tapma kitabxanasının həyata keçirilməsi tapılmadı
 	</floater.string>

indra/newview/skins/default/xui/de/floater_model_preview.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="Modell hochladen">
-	<string name="no_havok">
-		Mesh-Upload mit Physics
-	</string>
 	<string name="status_idle"/>
 	<string name="status_parse_error">
 		Fehler: Fehler beim Modell-Parsen – Details siehe Protokoll.
@@ -73,9 +70,6 @@
 	<string name="phys_status_degenerate_triangles">
 		Das Physik-Netz enthält degenerierte Dreiecke. Probieren Sie Analysieren/Vereinfachen.
 	</string>
-	<string name="phys_status_no_havok">
-		Diese Version enthält keine Havok-Unterstützung und wird nicht für das Hochladen von Physik in Second Life empfohlen. Unvorhersehbare Ergebnisse sind möglich!
-	</string>
 	<string name="phys_status_too_thin">
 		Eine oder mehrere Dimensionen sind kleiner als 0,5m - nur Hüllen-basierte (analysierte) physische Formen werden korrekt funktionieren.
 	</string>

indra/newview/skins/default/xui/de/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Pathfinding-Ansicht/-Test">
+    <floater.string name="no_havok">
+        Pathfinding-Ansicht/-Test
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Pathfinding-Bibliotheksimplementierung nicht gefunden.
 	</floater.string>

indra/newview/skins/default/xui/en/floater_model_preview.xml

@@ -11,8 +11,6 @@
  name="Model Preview"
  title="Upload Model"
  help_topic="upload_model">
-  <string name="no_havok">mesh upload with physics</string>
-
   <string name="status_idle"></string>
   <string name="status_parse_error">Error: Model parsing issue - see log for details.</string>
   <string name="status_bind_shape_orientation">Warning: bind shape matrix is not in standard X-forward orientation.</string>
@@ -37,7 +35,6 @@
   <string name="phys_status_vertex_limit_exceeded">Some physical hulls exceed the vertex limit (256); try an alternative 'Analyze Method'.</string>
   <string name="phys_status_hull_limit_exceeded">Some models exceed the hull limit (256); try 'simplify'.</string>
   <string name="phys_status_degenerate_triangles">The physics mesh is too dense or contains degenerate triangles. Use Analyze/Simplify to resolve.</string>
-  <string name="phys_status_no_havok">This version contains no Havok support and is not recommended for physics upload in Second Life. Results may be unpredictable.</string>
   <string name="phys_status_too_thin">One or more dimensions is less than 0.5m, only hull-based (analyzed) physics shapes will work correctly.</string>
   <string name="phys_status_unknown_error">An unrecognized error was detected.</string>
   <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->

indra/newview/skins/default/xui/en/floater_pathfinding_console.xml

@@ -11,6 +11,7 @@
     single_instance="true"
     title="Pathfinding view / test"
     width="240">
+  <floater.string name="no_havok">Pathfinding view / test</floater.string>
   <floater.string name="navmesh_viewer_status_unknown"></floater.string>
   <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
   <floater.string name="navmesh_viewer_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>

indra/newview/skins/default/xui/es/floater_model_preview.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="Subir modelo">
-	<string name="no_havok">
-		subida mesh con física
-	</string>
 	<string name="status_parse_error">
 		Error: Problema de análisis de DAE - consulta los datos en el registro.
 	</string>

indra/newview/skins/default/xui/es/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Vista/prueba de pathfinding">
+    <floater.string name="no_havok">
+        Vista/prueba de pathfinding
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		No se encuentra la implementación de la biblioteca de localización de rutas.
 	</floater.string>

indra/newview/skins/default/xui/fr/floater_model_preview.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="Chargement du modèle">
-<string name="no_havok">téléchargement du maillage avec physique</string>
 <string name="status_parse_error">Erreur : Problème d&apos;analyse du modèle ; reportez-vous au journal pour plus de détails.</string>
 <string name="status_bind_shape_orientation">Avertissement : la matrice de formes de reliure n&apos;est pas dans l&apos;orientation standard X-avant.</string>
 <string name="status_material_mismatch">Erreur : le matériau du modèle ne correspond pas à un sous-ensemble du modèle de référence.</string>
@@ -24,7 +23,6 @@
 <string name="phys_status_vertex_limit_exceeded">Certaines enveloppes physiques dépassent les limites de sommets.</string>
 <string name="phys_status_hull_limit_exceeded">Certains modèles dépassent la limite de la coque (256) ; essayez de "simplifier"..</string>
 <string name="phys_status_degenerate_triangles">Le maillage physique est trop dense ou contient des triangles non cohérents. Utilisez Analyser/Simplifier pour résoudre ce problème.</string>
-<string name="phys_status_no_havok">Cette version ne contient pas de support Havok et n'est pas recommandée pour le chargement de physiques dans Second Life. Les résultats peuvent être imprévisibles.</string>
 <string name="phys_status_too_thin">Une ou plusieurs dimensions sont inférieures à 0,5 m, seules les formes physiques basées sur la coque (analysées) fonctionneront correctement.</string>
 <string name="phys_status_unknown_error">Une erreur inconnue a été détectée.</string>
 <string name="layer_all">Tout</string>

indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Vue/Test de recherche de chemin">
+    <floater.string name="no_havok">
+        Vue/Test de recherche de chemin
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Implémentation de la bibliothèque de recherche de chemin introuvable
 	</floater.string>

indra/newview/skins/default/xui/it/floater_model_preview.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="Caricamento Modello Mesh">
-	<string name="no_havok">
-		caricamento mesh con fisica
-	</string>
 	<string name="status_idle"/>
 	<string name="status_parse_error">
 		Errore: Errore elaborazione Dae - vedere il registro per informazioni dettagliate.
@@ -73,9 +70,6 @@
 	<string name="phys_status_degenerate_triangles">
 		La mesh fisica è troppo densa o contiene triangoli degenerati. Utilizzare Analizza/Semplifica per risolvere.
 	</string>
-	<string name="phys_status_no_havok">
-		Questa versione non contiene supporto Havok e non è consigliata per il caricamento di dati fisici in Second Life. I risultati potrebbero essere imprevedibili.
-	</string>
 	<string name="phys_status_too_thin">
 		Una o più dimensioni sono inferiori a 0,5 m, solo le forme fisiche basate sull'hull (analizzate) funzioneranno correttamente.
 	</string>

indra/newview/skins/default/xui/it/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Visualizzazione / test pathfinding">
+    <floater.string name="no_havok">
+        Visualizzazione / test pathfinding
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Implementazione libreria percorsi non trovata.
 	</floater.string>

indra/newview/skins/default/xui/ja/floater_model_preview.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="モデルのアップロード">
-	<string name="no_havok">
-		物理と一緒にメッシュをアップロードします。
-	</string>
 	<string name="status_parse_error">
 		エラー：DAEファイルに問題が見つかりました。－詳細につきましてはログをご確認ください。
 	</string>
@@ -72,9 +69,6 @@
 	<string name="phys_status_degenerate_triangles">
 		物理メッシュが密すぎるか、極小な三角形が含まれています。この問題を解決するには、分析／簡素化を使用します。
 	</string>
-	<string name="phys_status_no_havok">
-		このバージョンはHavok対応ではありません。このため、Second Lifeに物理をアップロードする事はお勧めできません。その結果は予測不可能なものとなります。
-	</string>
 	<string name="phys_status_too_thin">
 		１つ以上の寸法が０．５ｍ未満の場合、殻ベース（分析済み）の物理シェイプのみが正しく機能します。
 	</string>

indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="経路探索の表示／テスト">
+    <floater.string name="no_havok">
+        経路探索の表示／テスト
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		経路探索ライブラリの実装が見つかりません。
 	</floater.string>

indra/newview/skins/default/xui/pl/floater_model_preview.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Model Preview" title="Przesyłanie modelu">
-<string name="no_havok">przesyłanie meszy z fizyką</string>
 <string name="status_parse_error">Błąd: Problem z parsowaniem modelu, zobacz log.</string>
 <string name="status_bind_shape_orientation">Uwaga: Macierz powiązań kształtu nie jest w standardowej orientacji X-forward.</string>
 <string name="status_material_mismatch">Błąd: Materiał nie jest podzbiorem modelu referencyjnego.</string>
@@ -24,7 +23,6 @@
 <string name="phys_status_vertex_limit_exceeded">Pewne fizyczne powłoki przekroczyły limit wierzchołków (256); Spróbuj 'analizy'.</string>
 <string name="phys_status_hull_limit_exceeded">Pewne modele przekroczyły limit powłok (256); Spróbuj 'upraszczania'.</string>
 <string name="phys_status_degenerate_triangles">Mesz fizyki zbyt gęsty lub ma zdegenerowane trójkąty. Użyj Analizuj/Uprość.</string>
-<string name="phys_status_no_havok">Ta wersja nie zawiera wsparcia Havoka i nie jest zalecana dla przesyłania fizyki do Second Life. Wyniki mogą być nieprzewidywalne.</string>
 <string name="phys_status_too_thin">Jeden z wymiarów ma mniej niż 0.5 m, tylko kształty fizyki oparte na kadłubie (po analizie) zadziałają poprawnie.</string>
 <string name="phys_status_unknown_error">Wykryto nierozpoznany błąd.</string>
 <string name="layer_all">Wszystko</string>

indra/newview/skins/default/xui/pl/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_pathfinding_console" title="Podgląd odnajdywania ścieżek">
+    <floater.string name="no_havok">
+        Podgląd odnajdywania ścieżek
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Nie można znaleźć implementacji biblioteki szukania ścieżek.
 	</floater.string>

indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Visualização/teste do pathfinding">
+    <floater.string name="no_havok">
+        Visualização/teste do pathfinding
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Impossível encontrar a implementação de biblioteca de pathing.
 	</floater.string>

indra/newview/skins/default/xui/ru/floater_model_preview.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="Загрузка модели">
-  <string name="no_havok">загрузка меша с физикой</string>
   <string name="status_parse_error">Ошибка: Проблема при анализе файла DAE – см. подробности в журнале.</string>
   <string name="status_bind_shape_orientation">Предупреждение: форма матрицы стандартно не ориентирована по координате X.</string>
   <string name="status_material_mismatch">Ошибка: Материал модели не входит в эталонную модель.</string>
@@ -24,7 +23,6 @@
   <string name="phys_status_vertex_limit_exceeded">Для некоторых физических оболочек превышен лимит вершин(256); попробуйте другой 'Метод Анализа'.</string>
   <string name="phys_status_hull_limit_exceeded">Некоторые модели превышают предел оболочек (256); попробуйте 'Упрощение'.</string>
   <string name="phys_status_degenerate_triangles">Физика меша слишком плотная или содержит вырожденные треугольники. Используйте Анализ/Упрощение для решения.</string>
-  <string name="phys_status_no_havok">Эта версия не поддерживает Havok и не рекомендуется для загрузки физики в Second Life. Результаты могут быть непредсказуемыми.</string>
   <string name="phys_status_too_thin">Один или несколько размеров меньше 0,5м, корректно будут работать только физические формы, основанные на корпусе (проанализированные).</string>
   <string name="phys_status_unknown_error">Обнаружена нераспознанная ошибка.</string>
   <string name="layer_all">Все</string>

indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Просмотр/тестирование поиска пути">
+    <floater.string name="no_havok">
+        Просмотр/тестирование поиска пути
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Не удалось найти реализацию библиотеки поиска пути
 	</floater.string>

indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="Yol bulma görüntüleme / test">
+    <floater.string name="no_havok">
+        Yol bulma görüntüleme / test
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		Yol bulma kütüphanesi uygulaması bulunamıyor.
 	</floater.string>

indra/newview/skins/default/xui/zh/floater_model_preview.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Model Preview" title="上傳模型">
-	<string name="no_havok">
-		物理網格模型上傳
-	</string>
 	<string name="status_parse_error">
 		錯誤：剖析模型時出錯，詳見記錄檔案。
 	</string>
@@ -72,9 +69,6 @@
 	<string name="phys_status_degenerate_triangles">
 		物理網格包含退化三角形。嘗試「分析/簡化」。
 	</string>
-	<string name="phys_status_no_havok">
-		此版本不包含Havok支援，不推薦用於上傳Second Life的物理內容。可能會出現不可預測的結果！
-	</string>
 	<string name="phys_status_too_thin">
 		一個或多個次元小於0.5公尺 - 只有基於凸包的（分析過的）物理形狀才會正確工作。
 	</string>

indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_pathfinding_console" title="尋路檢視 / 測試">
-	<floater.string name="no_havok">
-		路徑尋路導航網格生成失敗
-	</floater.string>
+    <floater.string name="no_havok">
+        尋路檢視 / 測試
+    </floater.string>
 	<floater.string name="navmesh_viewer_status_library_not_implemented">
 		找不到尋路函式庫的實作。
 	</floater.string>