livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-10989 Toggle checkbox when clicking 'Avatars on other parcels can see and chat...' label

meow-7.2.2
maxim_productengine 2019-04-19 16:07:41 +03:00
parent 02e1e6de8d
commit eea440b454
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloaterland.cpp
View File

@ -1923,6 +1923,13 @@ BOOL LLPanelLandOptions::postBuild()
mSeeAvatarsCtrl = getChild<LLCheckBoxCtrl>( "SeeAvatarsCheck");
childSetCommitCallback("SeeAvatarsCheck", onCommitAny, this);
if (hasChild("allow_see_label", TRUE))
{
getChild<LLTextBox>("allow_see_label")->setShowCursorHand(false);
getChild<LLTextBox>("allow_see_label")->setSoundFlags(LLView::MOUSE_UP);
getChild<LLTextBox>("allow_see_label")->setClickedCallback(boost::bind(&toggleSeeAvatars, this));
}
mCheckShowDirectory = getChild<LLCheckBoxCtrl>( "ShowDirectoryCheck");
childSetCommitCallback("ShowDirectoryCheck", onCommitAny, this);
@ -2364,7 +2371,16 @@ void LLPanelLandOptions::onClickClear(void* userdata)
self->refresh();
}
void LLPanelLandOptions::toggleSeeAvatars(void* userdata)
{
LLPanelLandOptions* self = (LLPanelLandOptions*)userdata;
if (self)
{
self->getChild<LLCheckBoxCtrl>("SeeAvatarsCheck")->toggle();
self->getChild<LLCheckBoxCtrl>("SeeAvatarsCheck")->setBtnFocus();
self->onCommitAny(NULL, userdata);
}
}
//---------------------------------------------------------------------------
// LLPanelLandAccess
//---------------------------------------------------------------------------

1
indra/newview/llfloaterland.h
View File

@ -327,6 +327,7 @@ private:
static void onCommitAny(LLUICtrl* ctrl, void *userdata);
static void onClickSet(void* userdata);
static void onClickClear(void* userdata);
static void toggleSeeAvatars(void* userdata);
private:
LLCheckBoxCtrl* mCheckEditObjects;

2
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -1477,7 +1477,7 @@ Only large parcels can be listed in search.
layout="topleft"
left="274"
top="150"
name="allow_label5"
name="allow_see_label"
width="205"
word_wrap="true">
Avatars on other parcels can see and chat with avatars on this parcel