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

Removed "textbox autofix" from translations and llpanelface.cpp, syncs up with Materials and fixes warnings

Browse Source
This commit is contained in:
Lirusaito
2013-07-10 19:26:31 -04:00
parent dfb4370a56
commit 781bb288ab
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llpanelface.cpp
View File

@@ -518,7 +518,6 @@ void LLPanelFace::getState()
BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced(); BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
// only turn on auto-adjust button if there is a media renderer and the media is loaded // only turn on auto-adjust button if there is a media renderer and the media is loaded
getChildView("textbox autofix")->setEnabled(editable);
getChildView("button align")->setEnabled(editable); getChildView("button align")->setEnabled(editable);
//if ( LLMediaEngine::getInstance()->getMediaRenderer () ) //if ( LLMediaEngine::getInstance()->getMediaRenderer () )
@@ -579,7 +578,6 @@ void LLPanelFace::getState()
if(LLViewerMedia::textureHasMedia(id)) if(LLViewerMedia::textureHasMedia(id))
{ {
getChildView("textbox autofix")->setEnabled(editable);
getChildView("button align")->setEnabled(editable); getChildView("button align")->setEnabled(editable);
} }
@@ -997,9 +995,6 @@ void LLPanelFace::getState()
getChildView("tex gen")->setEnabled(FALSE); getChildView("tex gen")->setEnabled(FALSE);
getChildView("label shininess")->setEnabled(FALSE); getChildView("label shininess")->setEnabled(FALSE);
getChildView("label bumpiness")->setEnabled(FALSE); getChildView("label bumpiness")->setEnabled(FALSE);
getChildView("textbox autofix")->setEnabled(FALSE);
getChildView("button align")->setEnabled(FALSE); getChildView("button align")->setEnabled(FALSE);
getChildView("button apply")->setEnabled(FALSE); getChildView("button apply")->setEnabled(FALSE);
//getChildView("has media")->setEnabled(FALSE); //getChildView("has media")->setEnabled(FALSE);

4
indra/newview/skins/default/xui/es/floater_tools.xml
View File

@@ -667,10 +667,6 @@
</text> </text>
<spinner label="Horizontal (U)" name="TexOffsetU"/> <spinner label="Horizontal (U)" name="TexOffsetU"/>
<spinner label="Vertical (V)" name="TexOffsetV"/> <spinner label="Vertical (V)" name="TexOffsetV"/>
<text name="textbox autofix">
Alinear textura para Media
(Se debe subir primero)
</text>
<button label="Alinear" label_selected="Alinear" name="button align" left="150" width="50"/> <button label="Alinear" label_selected="Alinear" name="button align" left="150" width="50"/>
<text name="textbox params" left="195" height="40"> <text name="textbox params" left="195" height="40">
Parámetros Parámetros

4
indra/newview/skins/default/xui/fr/floater_tools.xml
View File

@@ -554,10 +554,6 @@
<text name="tex offset"> <text name="tex offset">
Décalage Décalage
</text> </text>
<text name="textbox autofix">
Ajuster la texture du média
(chargement préalable)
</text>
<button label="Ajuster" label_selected="Ajuster" left="140" name="button align" width="45"/> <button label="Ajuster" label_selected="Ajuster" left="140" name="button align" width="45"/>
<text name="textbox params">Paramètres</text> <text name="textbox params">Paramètres</text>
<button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier" width="55"/> <button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier" width="55"/>

3
indra/newview/skins/default/xui/pt/floater_tools.xml
View File

@@ -571,9 +571,6 @@
</text> </text>
<spinner label="Horizontal (U)" name="TexOffsetU"/> <spinner label="Horizontal (U)" name="TexOffsetU"/>
<spinner label="Vertical (V)" name="TexOffsetV"/> <spinner label="Vertical (V)" name="TexOffsetV"/>
<text name="textbox autofix">
Alinhar Texturas
</text>
<button label="Alinhar" label_selected="Alinhar" name="button align"/> <button label="Alinhar" label_selected="Alinhar" name="button align"/>
</panel> </panel>
<panel label="Conteúdo" name="Contents"> <panel label="Conteúdo" name="Contents">