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

Merge branch 'ManagedMarketplace' of https://github.com/Lirusaito/SingularityViewer into ManagedMarketplace

Browse Source
This commit is contained in:
Damian Zhaoying
2019-03-13 20:40:39 -03:00
parent a07f90c158 9b6c34213b
commit bd60dfb61d
9 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/llui/llslider.cpp
View File

@@ -54,7 +54,6 @@ LLSlider::LLSlider(
F32 min_value, F32 min_value,
F32 max_value, F32 max_value,
F32 increment, F32 increment,
BOOL volume,
const std::string& control_name) const std::string& control_name)
: :
LLUICtrl( name, rect, TRUE, commit_callback, LLUICtrl( name, rect, TRUE, commit_callback,
@@ -64,7 +63,6 @@ LLSlider::LLSlider(
mMinValue( min_value ), mMinValue( min_value ),
mMaxValue( max_value ), mMaxValue( max_value ),
mIncrement( increment ), mIncrement( increment ),
mVolumeSlider( volume ),
mMouseOffset( 0 ), mMouseOffset( 0 ),
mTrackColor( LLUI::sColorsGroup->getColor( "SliderTrackColor" ) ), mTrackColor( LLUI::sColorsGroup->getColor( "SliderTrackColor" ) ),
mThumbOutlineColor( LLUI::sColorsGroup->getColor( "SliderThumbOutlineColor" ) ), mThumbOutlineColor( LLUI::sColorsGroup->getColor( "SliderThumbOutlineColor" ) ),
@@ -317,20 +315,11 @@ LLXMLNodePtr LLSlider::getXML(bool save_children) const
{ {
LLXMLNodePtr node = LLUICtrl::getXML(); LLXMLNodePtr node = LLUICtrl::getXML();
if (mVolumeSlider) node->setName(LL_SLIDER_TAG);
{
node->setName(LL_VOLUME_SLIDER_CTRL_TAG);
}
else
{
node->setName(LL_SLIDER_TAG);
}
node->createChild("initial_val", TRUE)->setFloatValue(getInitialValue()); node->createChild("initial_val", TRUE)->setFloatValue(getInitialValue());
node->createChild("min_val", TRUE)->setFloatValue(getMinValue()); node->createChild("min_val", TRUE)->setFloatValue(getMinValue());
node->createChild("max_val", TRUE)->setFloatValue(getMaxValue()); node->createChild("max_val", TRUE)->setFloatValue(getMaxValue());
node->createChild("increment", TRUE)->setFloatValue(getIncrement()); node->createChild("increment", TRUE)->setFloatValue(getIncrement());
node->createChild("volume", TRUE)->setBoolValue(mVolumeSlider);
return node; return node;
} }
@@ -365,17 +354,13 @@ LLView* LLSlider::fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFacto
F32 increment = 0.1f; F32 increment = 0.1f;
node->getAttributeF32("increment", increment); node->getAttributeF32("increment", increment);
BOOL volume = node->hasName("volume_slider") ? TRUE : FALSE;
node->getAttributeBOOL("volume", volume);
LLSlider* slider = new LLSlider("slider_bar", LLSlider* slider = new LLSlider("slider_bar",
rect, rect,
NULL, NULL,
initial_value, initial_value,
min_value, min_value,
max_value, max_value,
increment, increment);
volume);
slider->initFromXML(node, parent); slider->initFromXML(node, parent);

2
indra/llui/llslider.h
View File

@@ -48,7 +48,6 @@ public:
F32 min_value, F32 min_value,
F32 max_value, F32 max_value,
F32 increment, F32 increment,
BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG
const std::string& control_name = LLStringUtil::null ); const std::string& control_name = LLStringUtil::null );
virtual LLXMLNodePtr getXML(bool save_children = true) const; virtual LLXMLNodePtr getXML(bool save_children = true) const;
@@ -92,7 +91,6 @@ private:
F32 mMaxValue; F32 mMaxValue;
F32 mIncrement; F32 mIncrement;
BOOL mVolumeSlider;
S32 mMouseOffset; S32 mMouseOffset;
LLRect mDragStartThumbRect; LLRect mDragStartThumbRect;

10
indra/llui/llsliderctrl.cpp
View File

@@ -59,7 +59,6 @@ LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect,
S32 text_left, S32 text_left,
BOOL show_text, BOOL show_text,
BOOL can_edit_text, BOOL can_edit_text,
BOOL volume,
commit_callback_t commit_callback, commit_callback_t commit_callback,
F32 initial_value, F32 min_value, F32 max_value, F32 increment, F32 initial_value, F32 min_value, F32 max_value, F32 increment,
const std::string& control_which) const std::string& control_which)
@@ -67,7 +66,6 @@ LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect,
mFont(font), mFont(font),
mShowText( show_text ), mShowText( show_text ),
mCanEditText( can_edit_text ), mCanEditText( can_edit_text ),
mVolumeSlider( volume ),
mPrecision( 3 ), mPrecision( 3 ),
mLabelBox( NULL ), mLabelBox( NULL ),
mLabelWidth( label_width ), mLabelWidth( label_width ),
@@ -105,7 +103,7 @@ LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect,
mSlider = new LLSlider(std::string("slider"), mSlider = new LLSlider(std::string("slider"),
slider_rect, slider_rect,
boost::bind(&LLSliderCtrl::onSliderCommit,_1,_2), boost::bind(&LLSliderCtrl::onSliderCommit,_1,_2),
initial_value, min_value, max_value, increment, volume, initial_value, min_value, max_value, increment,
control_which ); control_which );
addChild( mSlider ); addChild( mSlider );
@@ -387,8 +385,6 @@ LLXMLNodePtr LLSliderCtrl::getXML(bool save_children) const
node->createChild("show_text", TRUE)->setBoolValue(mShowText); node->createChild("show_text", TRUE)->setBoolValue(mShowText);
node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText); node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText);
node->createChild("volume", TRUE)->setBoolValue(mVolumeSlider);
node->createChild("decimal_digits", TRUE)->setIntValue(mPrecision); node->createChild("decimal_digits", TRUE)->setIntValue(mPrecision);
@@ -438,9 +434,6 @@ LLView* LLSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
BOOL can_edit_text = FALSE; BOOL can_edit_text = FALSE;
node->getAttributeBOOL("can_edit_text", can_edit_text); node->getAttributeBOOL("can_edit_text", can_edit_text);
BOOL volume = FALSE;
node->getAttributeBOOL("volume", volume);
F32 initial_value = 0.f; F32 initial_value = 0.f;
node->getAttributeF32("initial_val", initial_value); node->getAttributeF32("initial_val", initial_value);
@@ -497,7 +490,6 @@ LLView* LLSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
rect.getWidth() - text_left, rect.getWidth() - text_left,
show_text, show_text,
can_edit_text, can_edit_text,
volume,
NULL, NULL,
initial_value, initial_value,
min_value, min_value,

4
indra/llui/llsliderctrl.h
View File

@@ -57,7 +57,6 @@ public:
S32 text_left, S32 text_left,
BOOL show_text, BOOL show_text,
BOOL can_edit_text, BOOL can_edit_text,
BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG
commit_callback_t commit_callback, commit_callback_t commit_callback,
F32 initial_value, F32 min_value, F32 max_value, F32 increment, F32 initial_value, F32 min_value, F32 max_value, F32 increment,
const std::string& control_which = LLStringUtil::null ); const std::string& control_which = LLStringUtil::null );
@@ -125,8 +124,7 @@ private:
const LLFontGL* mFont; const LLFontGL* mFont;
BOOL mShowText; BOOL mShowText;
BOOL mCanEditText; BOOL mCanEditText;
BOOL mVolumeSlider;
S32 mPrecision; S32 mPrecision;
LLTextBox* mLabelBox; LLTextBox* mLabelBox;
S32 mLabelWidth; S32 mLabelWidth;

2
indra/newview/llappviewer.cpp
View File

@@ -2643,6 +2643,8 @@ void LLAppViewer::cleanupSavedSettings()
{ {
gSavedSettings.setF32("RenderFarClip", gAgentCamera.mDrawDistance); gSavedSettings.setF32("RenderFarClip", gAgentCamera.mDrawDistance);
} }
LLSpeakerVolumeStorage::deleteSingleton();
} }
void LLAppViewer::removeCacheFiles(const std::string& file_mask) void LLAppViewer::removeCacheFiles(const std::string& file_mask)

10
indra/newview/lldebugmessagebox.cpp
View File

@@ -56,25 +56,25 @@ LLDebugVarMessageBox::LLDebugVarMessageBox(const std::string& title, EDebugVarTy
switch(var_type) switch(var_type)
{ {
case VAR_TYPE_F32: case VAR_TYPE_F32:
mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, *((F32*)var), -100.f, 100.f, 0.1f, LLStringUtil::null); mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, NULL, *((F32*)var), -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider1->setPrecision(3); mSlider1->setPrecision(3);
addChild(mSlider1); addChild(mSlider1);
mSlider2 = NULL; mSlider2 = NULL;
mSlider3 = NULL; mSlider3 = NULL;
break; break;
case VAR_TYPE_S32: case VAR_TYPE_S32:
mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, LLStringUtil::null); mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, LLStringUtil::null);
mSlider1->setPrecision(0); mSlider1->setPrecision(0);
addChild(mSlider1); addChild(mSlider1);
mSlider2 = NULL; mSlider2 = NULL;
mSlider3 = NULL; mSlider3 = NULL;
break; break;
case VAR_TYPE_VEC3: case VAR_TYPE_VEC3:
mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), std::string("x: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, LLStringUtil::null); mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), std::string("x: "), NULL, 70, 130, TRUE, TRUE, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider1->setPrecision(3); mSlider1->setPrecision(3);
mSlider2 = new LLSliderCtrl(std::string("slider 2"), LLRect(20,100,190,80), std::string("y: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, LLStringUtil::null); mSlider2 = new LLSliderCtrl(std::string("slider 2"), LLRect(20,100,190,80), std::string("y: "), NULL, 70, 130, TRUE, TRUE, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider2->setPrecision(3); mSlider2->setPrecision(3);
mSlider3 = new LLSliderCtrl(std::string("slider 3"), LLRect(20,70,190,50), std::string("z: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, LLStringUtil::null); mSlider3 = new LLSliderCtrl(std::string("slider 3"), LLRect(20,70,190,50), std::string("z: "), NULL, 70, 130, TRUE, TRUE, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, LLStringUtil::null);
mSlider3->setPrecision(3); mSlider3->setPrecision(3);
addChild(mSlider1); addChild(mSlider1);
addChild(mSlider2); addChild(mSlider2);

6
indra/newview/llinventorybridge.cpp
View File

@@ -2333,11 +2333,11 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
{ {
const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH, false); const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH, false);
const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK, false); const LLUUID &landmarks_id = model->findCategoryUUIDForType(LLFolderType::FT_LANDMARK, false);
const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false); //const LLUUID &my_outifts_id = model->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS, false);
const BOOL move_is_into_trash = (mUUID == trash_id) || model->isObjectDescendentOf(mUUID, trash_id); const BOOL move_is_into_trash = (mUUID == trash_id) || model->isObjectDescendentOf(mUUID, trash_id);
const BOOL move_is_into_my_outfits = (mUUID == my_outifts_id) || model->isObjectDescendentOf(mUUID, my_outifts_id); //const BOOL move_is_into_my_outfits = (mUUID == my_outifts_id) || model->isObjectDescendentOf(mUUID, my_outifts_id);
const BOOL move_is_into_outfit = move_is_into_my_outfits || (getCategory() && getCategory()->getPreferredType() == LLFolderType::FT_OUTFIT); const BOOL move_is_into_outfit = /*move_is_into_my_outfits ||*/ (getCategory() && getCategory()->getPreferredType() == LLFolderType::FT_OUTFIT);
const BOOL move_is_into_landmarks = (mUUID == landmarks_id) || model->isObjectDescendentOf(mUUID, landmarks_id); const BOOL move_is_into_landmarks = (mUUID == landmarks_id) || model->isObjectDescendentOf(mUUID, landmarks_id);
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------

6
indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
View File

@@ -13,11 +13,11 @@
<column dynamicwidth="true" label="Name" name="speaker_name" /> <column dynamicwidth="true" label="Name" name="speaker_name" />
<column label="" name="speaking_status" width="0" /> <column label="" name="speaking_status" width="0" />
</scroll_list> </scroll_list>
<volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5" <slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
left="0" max_val="1.0" min_val="0.0" name="speaker_volume" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" show_text="true" can_edit_text="true" val_width="28" decimal_digits="2"
width="145" /> width="145" />
<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" left_delta="145" image_unselected="icn_speaker_dark.tga" label="" left_delta="149"
name="mute_btn" toggle="true" tool_tip="Mute voice for this resident" name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
width="25" scale_image="false" /> width="25" scale_image="false" />
</layout_panel> </layout_panel>

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

@@ -17,8 +17,8 @@
<panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" height="77" left="0" name="speaker_controls" width="140"> <panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" height="77" left="0" name="speaker_controls" width="140">
<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/> <button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text> <text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/> <slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" show_text="true" can_edit_text="true" val_width="28" decimal_digits="2" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/> <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="114" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/> <check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
</panel> </panel>
</layout_panel> </layout_panel>