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

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

Browse Source
This commit is contained in:
Shyotl
2012-12-14 16:59:49 -06:00
parent 034c83f996 38f59e640c
commit 6c9df4574c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llselectmgr.cpp
View File

@@ -6430,7 +6430,7 @@ LLBBox LLSelectMgr::getBBoxOfSelection() const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BOOL LLSelectMgr::canUndo() const BOOL LLSelectMgr::canUndo() const
{ {
return const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstEditableObject() != NULL; // HACK: casting away constness - MG return const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstMoveableObject() != NULL; // HACK: casting away constness - MG
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -6448,7 +6448,7 @@ void LLSelectMgr::undo()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BOOL LLSelectMgr::canRedo() const BOOL LLSelectMgr::canRedo() const
{ {
return const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstEditableObject() != NULL; // HACK: casting away constness - MG return const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstMoveableObject() != NULL; // HACK: casting away constness - MG
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
indra/newview/skins/default/xui/en-us/floater_post_process.xml
View File

@@ -236,7 +236,7 @@
<slider bottom_delta="-35" can_edit_text="true" <slider bottom_delta="-35" can_edit_text="true"
decimal_digits="3" follows="left" decimal_digits="3" follows="left"
height="18" increment=".05" initial_val="1" label="" left="14" height="18" increment=".05" initial_val="1" label="" left="14"
max_val="10" min_val="0" mouse_opaque="true" max_val="10" min_val="0" mouse_opaque="true" val_width="35"
name="vignette_desaturation" show_text="true" value="0" width="200" /> name="vignette_desaturation" show_text="true" value="0" width="200" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right" bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
@@ -248,7 +248,7 @@
<slider bottom_delta="-35" can_edit_text="true" <slider bottom_delta="-35" can_edit_text="true"
decimal_digits="3" follows="left" decimal_digits="3" follows="left"
height="18" increment="0.0005" initial_val=".01" label="" left="14" height="18" increment="0.0005" initial_val=".01" label="" left="14"
max_val=".1" min_val="0" mouse_opaque="true" max_val=".1" min_val="0" mouse_opaque="true" val_width="35"
name="vignette_chromatic_aberration" show_text="true" value="0" width="200" /> name="vignette_chromatic_aberration" show_text="true" value="0" width="200" />
</panel> </panel>
<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400" <!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"