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

SL-9747 [Mesh Uploader] Remove confusing model_metric from upload

meow-7.2.2
andreykproductengine 2018-11-29 21:04:35 +02:00
parent e382276dcc
commit d9fdb948d9
4 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llprimitive/llmodel.h
View File

@ -154,7 +154,6 @@ public:
void ClearFacesAndMaterials() { mVolumeFaces.clear(); mMaterialList.clear(); }
std::string getName() const;
std::string getMetric() const {return mMetric;}
EModelStatus getStatus() const {return mStatus;}
static std::string getStatusString(U32 status) ;
@ -260,8 +259,6 @@ public:
std::string mRequestedLabel; // name requested in UI, if any.
std::string mLabel; // name computed from dae.
std::string mMetric; // user-supplied metric data for upload
LLVector3 mNormalizedScale;
LLVector3 mNormalizedTranslation;

3
indra/newview/llfloatermodelpreview.cpp
View File

@ -1418,8 +1418,6 @@ void LLModelPreview::rebuildUploadData()
std::string requested_name = mFMP->getChild<LLUICtrl>("description_form")->getValue().asString();
std::string metric = mFMP->getChild<LLUICtrl>("model_category_combo")->getValue().asString();
LLSpinCtrl* scale_spinner = mFMP->getChild<LLSpinCtrl>("import_scale");
F32 scale = scale_spinner->getValue().asReal();
@ -1460,7 +1458,6 @@ void LLModelPreview::rebuildUploadData()
if (base_model && !requested_name.empty())
{
base_model->mRequestedLabel = requested_name;
base_model->mMetric = metric;
}
for (int i = LLModel::NUM_LODS - 1; i >= LLModel::LOD_IMPOSTOR; i--)

14
indra/newview/llmeshrepository.cpp
View File

@ -2174,7 +2174,6 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
std::map<LLModel*,S32> mesh_index;
std::string model_name;
std::string model_metric;
S32 instance_num = 0;
@ -2204,11 +2203,6 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
model_name = data.mBaseModel->getName();
}
if (model_metric.empty())
{
model_metric = data.mBaseModel->getMetric();
}
std::stringstream ostr;
LLModel::Decomposition& decomp =
@ -2363,11 +2357,6 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
model_name = data.mBaseModel->getName();
}
if (model_metric.empty())
{
model_metric = data.mBaseModel->getMetric();
}
std::stringstream ostr;
LLModel::Decomposition& decomp =
@ -2498,8 +2487,7 @@ 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_Unspecified";
res["metric"] = model_metric;
res["metric"] = "MUT_Unspecified";
result["asset_resources"] = res;
dump_llsd_to_file(result,make_dump_name("whole_model_",dump_num));

29
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -73,35 +73,6 @@
prevalidate_callback="ascii"
top_pad="5"
width="290" />
<text
follows="left|top"
height="15"
layout="topleft"
left_pad="15"
name="model_category_label"
text_color="White"
top="0"
width="200">
This model represents...
</text>
<combo_box
follows="left|top"
height="23"
left_pad="10"
name="model_category_combo"
top_pad="10"
width="200">
<combo_box.drop_down_button
label_color="White"/>
<combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
<combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
<combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
<combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
<combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
<combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
<combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
<combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
</combo_box>
</panel>
<tab_container
follows="top|left"