Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-12 01:01:01 +01:00
parent 3430a31e9d 943f77eed0
commit f10402cbdb
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfloatermodelpreview.cpp
View File

@@ -726,8 +726,10 @@ void LLFloaterModelPreview::draw()
}
}
/* Singu Note: Dummy views and what for?
childSetTextArg("prim_cost", "[PRIM_COST]", llformat("%d", mModelPreview->mResourceCost));
childSetTextArg("description_label", "[TEXTURES]", llformat("%d", mModelPreview->mTextureSet.size()));
*/
if (mModelPreview)
{
@@ -1155,7 +1157,7 @@ void LLFloaterModelPreview::initDecompControls()
mDecompParams[param[i].mName] = LLSD(param[i].mDefault.mBool);
//llinfos << "Type: boolean, Default: " << (param[i].mDefault.mBool ? "True" : "False") << llendl;
LLCheckBoxCtrl* check_box = getChild<LLCheckBoxCtrl>(name);
LLCheckBoxCtrl* check_box = findChild<LLCheckBoxCtrl>(name);
if (check_box)
{
check_box->setValue(param[i].mDefault.mBool);
@@ -3710,7 +3712,6 @@ void LLModelPreview::loadModelCallback(S32 lod)
mLoading = false;
if (mFMP)
{
mFMP->getChild<LLCheckBoxCtrl>("confirm_checkbox")->set(FALSE);
if (!mBaseModel.empty())
{
if (mFMP->getChild<LLUICtrl>("description_form")->getValue().asString().empty())
@@ -4193,7 +4194,9 @@ void LLModelPreview::updateStatusMessages()
}
}
/* Singu Note: Dummy views and what for?
mFMP->childSetTextArg("submeshes_info", "[SUBMESHES]", llformat("%d", total_submeshes[LLModel::LOD_HIGH]));
*/
std::string mesh_status_na = mFMP->getString("mesh_status_na");
@@ -5524,12 +5527,6 @@ void LLModelPreview::setPreviewLOD(S32 lod)
combo_box->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
mFMP->childSetText("lod_file_" + lod_name[mPreviewLOD], mLODFile[mPreviewLOD]);
LLComboBox* combo_box2 = mFMP->getChild<LLComboBox>("preview_lod_combo2");
combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
LLComboBox* combo_box3 = mFMP->getChild<LLComboBox>("preview_lod_combo3");
combo_box3->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
LLColor4 highlight_color = LLUI::sColorsGroup->getColor("MeshImportTableHighlightColor");
LLColor4 normal_color = LLUI::sColorsGroup->getColor("MeshImportTableNormalColor");

BIN
indra/newview/skins/default/textures/green_checkmark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 414 B

BIN
indra/newview/skins/default/textures/red_x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 624 B

5
indra/newview/skins/default/xui/en-us/floater_model_preview.xml
View File

@@ -536,6 +536,9 @@
left_delta="100" bottom_delta="0" height="16" width="90">
Server: [SIM]
</text>
<text name="price_breakdown" follows="top|left" left="5" bottom_delta="-18" height="16" width="615">
Price Breakdown: Streaming: [CURRENCY] [STREAMING] Physics: [CURRENCY] [PHYSICS] Instances: [CURRENCY] [INSTANCES] Textures: [CURRENCY] [TEXTURES] Model: [CURRENCY] [MODEL]
</text>
<!-- NOTE MESSAGE -->
<text name="warning_title" font="SansSerif" follows="top|left"
@@ -554,7 +557,7 @@
</text>
<text name="status" follows="top|left"
left="5" bottom_delta="-20" height="16" width="615">
left="5" bottom_delta="-18" height="16" width="615">
[STATUS]
</text>
</panel>

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

@@ -40,6 +40,7 @@
<check_box label="Signale les nouveaux IM entrants" name="chat_steal_focus"/>
<check_box label="Montre la barre du chat local séparée (Déco Reco)" tool_tip="" name="show_local_chat_floater_bar"/>
<check_box label="boutons horizontaux pour les contacts (Déco Reco)" tool_tip="Activé, les boutons amis/groupes seront en bas et horizontaux et non plus verticaux et à droite." name="horiz_butt"/>
<check_box label="Utilise les anciens noms pour la liste des voices actives" tool_tip="Aide <20> une meilleure mod<6F>ration en ne montrant que le nom <20>l'ancienne" name="legacy_speaker_names"/>
<check_box label="Boutons sur la même ligne que les noms pour les IMs" name="im_concise_butt"/>
<check_box label="Boutons sur la ligne des noms des chats de groupe" name="group_concise_butt"/>
<check_box label="Boutons sur la ligne de titre des conférences" name="conf_concise_butt"/>

2
indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
View File

@@ -2,7 +2,7 @@
<panel name="chat">
<text name="voice_unavailable">Le chat vocal n'est pas disponible</text>
<check_box label="Activer la voix" name="enable_voice_check"/>
<string value="Permet de connecter en m<>me temps plusieurs sessions en voice simultan<61>e (d<EFBFBD>co reco)" name="multivoice_label"/>
<string value="Permet de connecter en m<>me temps plusieurs sessions en voice simultan<61>e (deco reco)" name="multivoice_label"/>
<radio_group name="ear_location">
<radio_item name="0">Ecouter depuis la position de la caméra</radio_item>
<radio_item name="1">Ecouter depuis la position de l'avatar</radio_item>