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

Added L$ price breakdown for model uploads

meow-7.2.2
Don Kjer 2011-07-09 19:50:36 -07:00
parent 121c4034db
commit 782c8a48f1
2 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloatermodelpreview.cpp
View File

@ -5490,6 +5490,11 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
childSetTextArg("weights", "[SIM]", tbd);
childSetTextArg("weights", "[PH]", tbd);
childSetTextArg("upload_fee", "[FEE]", tbd);
childSetTextArg("price_breakdown", "[STREAMING]", tbd);
childSetTextArg("price_breakdown", "[PHYSICS]", tbd);
childSetTextArg("price_breakdown", "[INSTANCES]", tbd);
childSetTextArg("price_breakdown", "[TEXTURES]", tbd);
childSetTextArg("price_breakdown", "[MODEL]", tbd);
}
}
@ -5501,8 +5506,14 @@ void LLFloaterModelPreview::onModelPhysicsFeeReceived(const LLSD& result, std::s
childSetTextArg("weights", "[SIM]", llformat("%0.3f", result["simulation_cost"].asReal()));
childSetTextArg("weights", "[PH]", llformat("%0.3f", result["physics_cost"].asReal()));
childSetTextArg("upload_fee", "[FEE]", llformat("%d", result["upload_price"].asInteger()));
childSetTextArg("price_breakdown", "[STREAMING]", llformat("%d", result["upload_price_breakdown"]["mesh_streaming"].asInteger()));
childSetTextArg("price_breakdown", "[PHYSICS]", llformat("%d", result["upload_price_breakdown"]["mesh_physics"].asInteger()));
childSetTextArg("price_breakdown", "[INSTANCES]", llformat("%d", result["upload_price_breakdown"]["mesh_instance"].asInteger()));
childSetTextArg("price_breakdown", "[TEXTURES]", llformat("%d", result["upload_price_breakdown"]["texture"].asInteger()));
childSetTextArg("price_breakdown", "[MODEL]", llformat("%d", result["upload_price_breakdown"]["model"].asInteger()));
childSetVisible("weights", true);
childSetVisible("upload_fee", true);
childSetVisible("price_breakdown", true);
mUploadBtn->setEnabled(mHasUploadPerm && !mUploadModelUrl.empty());
}

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

@ -84,7 +84,7 @@
</text>
<text
text_color="White"
height="50"
height="40"
width="290"
top_delta="15"
left_delta="0"
@ -92,31 +92,67 @@
parse_urls="true"
wrap="true"
visible="false">
You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.
</text>
You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.</text>
<text
height="50"
top_delta="55"
height="65"
top_delta="45"
left_delta="0"
name="weights"
width="290"
name="weights_text"
width="80"
word_wrap="true"
>
<text
follows="top|left"
>Test0: [EQ]
</text>
<text
>Test: [ST]
</text>
Streaming: [ST]
Simulation: [SIM]
Physics: [PH]
Prim equivs: [EQ]
Streaming:
Physics:
Simulation:
Prim equivs:
</text>
<text
height="65"
top_delta="0"
left_delta="80"
name="weights"
width="70"
word_wrap="true"
>
[ST]
[PH]
[SIM]
[EQ]
</text>
<text
height="65"
top_delta="0"
left_delta="70"
name="price_breakdown_text"
width="80"
word_wrap="true"
>
Streaming:
Physics:
Instances:
Textures:
Model:
</text>
<text
height="65"
top_delta="0"
left_delta="80"
name="price_breakdown"
width="65"
word_wrap="true"
>
L$ [STREAMING]
L$ [PHYSICS]
L$ [INSTANCES]
L$ [TEXTURES]
L$ [MODEL]
</text>
<tab_container
follows="right|top|bottom"