diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-09-05 19:51:19 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-09-05 19:51:19 +0300 |
| commit | 03f835c87ea783250c89e0949f4e3dc800f0db69 (patch) | |
| tree | fbfe4f4417eaeb77f1c3c73b55891db47c7589b1 | |
| parent | 97c6672634b4c6620ebc320ec05758fc2ea99288 (diff) | |
| parent | 76f867c8913094573bfa278fc39907d6b0779ec5 (diff) | |
merge
| -rwxr-xr-x[-rw-r--r--] | indra/newview/featuretable.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_model_preview.xml | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 1f9dc6e4e5..e12c2f7853 100644..100755 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -88,7 +88,7 @@ RenderTerrainLODFactor 1 1 RenderTransparentWater 1 0 RenderTreeLODFactor 1 0 RenderUseImpostors 1 1 -RenderVolumeLODFactor 1 0.5 +RenderVolumeLODFactor 1 1.125 VertexShaderEnable 1 0 WindLightUseAtmosShaders 1 0 WLSkyDetail 1 48 diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index bd18da2251..25ae514274 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1460,8 +1460,8 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures) if (model_name.empty()) model_name = "mesh model"; result["name"] = model_name; - if (model_metric.empty()) model_metric = "MUT_Other"; - result["metric"] = model_metric; + if (model_metric.empty()) model_metric = "MUT_Unspecified"; + res["metric"] = model_metric; result["asset_resources"] = res; dump_llsd_to_file(result,make_dump_name("whole_model_",dump_num)); diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 52e70f3b6d..4f50802bac 100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -4,8 +4,8 @@ name="Model Preview" title="Upload Model" width="620" help_topic="upload_model" > - <string name="status_idle">Idle</string> - <string name="status_parse_error">Dae parsing issue - see log for details.</string> + <string name="status_idle"></string> + <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string> <string name="status_reading_file">Loading...</string> <string name="status_generating_meshes">Generating Meshes...</string> <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> @@ -28,6 +28,8 @@ <string name="tbd">TBD</string> + <text text_color="Yellow" left="10" bottom_delta="0" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text> + <!-- <text height="65" |