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

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

Browse Source 
Conflicts:
	indra/llrender/llpostprocess.cpp
This commit is contained in:
Lirusaito
2012-08-10 23:39:06 -04:00
parent fda34fea46 be8b838334
commit f4324e8890
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llpostprocess.cpp
View File

@@ -565,13 +565,13 @@ void LLPostProcess::setSelectedEffect(std::string const & effectName)
} }
} }
void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& value) void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD value)
{ {
char buf[256]; char buf[256];
S32 elem=0; S32 elem=0;
if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2) if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2)
{ {
mSelectedEffectInfo[std::string(buf)][elem] = value; mSelectedEffectInfo[static_cast<const char*>(buf)][elem] = value;
} }
else else
{ {

2
indra/llrender/llpostprocess.h
View File

@@ -149,7 +149,7 @@ public:
inline LLSD const & getSelectedEffectInfo(void) const { return mSelectedEffectInfo; } inline LLSD const & getSelectedEffectInfo(void) const { return mSelectedEffectInfo; }
// Setters // Setters
void setSelectedEffect(std::string const & effectName); void setSelectedEffect(std::string const & effectName);
void setSelectedEffectValue(std::string const & setting, LLSD& value); void setSelectedEffectValue(std::string const & setting, LLSD value);
void resetSelectedEffect(); void resetSelectedEffect();
void saveEffectAs(std::string const & effectName); void saveEffectAs(std::string const & effectName);
}; };

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

@@ -146,25 +146,25 @@
left="14" max_val="1" min_val="0" mouse_opaque="true" left="14" max_val="1" min_val="0" mouse_opaque="true"
name="noise_strength" show_text="true" value="1.0" width="220" /> name="noise_strength" show_text="true" value="1.0" width="220" />
</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"
label="Posterize" left="1" mouse_opaque="false" label="Posterize" left="1" mouse_opaque="false"
name="PosterizePanel" width="398"> name="PosterizePanel" width="398">
<check_box bottom="-20" follows="left|top" <check_box bottom="-40" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false" label="Enable" font="SansSerifSmall" height="16" initial_value="false" label="Enable"
left="14" mouse_opaque="true" name="enable_posterize" width="200" /> left="4" mouse_opaque="true" name="enable_posterize" 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"
font="SansSerif" h_pad="0" halign="left" height="16" font="SansSerif" h_pad="0" halign="left" height="16"
left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0" left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
width="355"> width="355">
Layer Count Layer Count
</text> </text>
<slider bottom_delta="-30" can_edit_text="true" <slider bottom_delta="-30" can_edit_text="true"
decimal_digits="3" follows="left" decimal_digits="3" follows="left"
height="18" increment="1" initial_val="10" label="" left="14" height="18" increment="1" initial_val="10" label="" left="14"
max_val="20" min_val="1" mouse_opaque="true" max_val="20" min_val="1" mouse_opaque="true"
name="posterize_layers" show_text="true" value="10" width="200" /> name="posterize_layers" show_text="true" value="10" 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"
label="Bloom" left="1" mouse_opaque="true" label="Bloom" left="1" mouse_opaque="true"
name="BloomPanel" width="398"> name="BloomPanel" width="398">