Commit f1890753 authored by Luminous Luminos's avatar Luminous Luminos
Browse files

Merge

parents c1eb9516 a879280b
......@@ -348,7 +348,7 @@ void LLGroupActions::activate(const LLUUID& group_id)
#if 0 // this isn't used!!!! <alchemy>
static bool isGroupUIVisible(const LLUUID& group_id)
{
auto* floaterp = LLFloaterReg::findInstance("group_profile", LLSD().with("group_id", group_id));
auto* floaterp = LLFloaterReg::findInstance("group_profile", LLSD(group_id));
return LLFloater::isVisible(floaterp);
}
#endif
......@@ -395,7 +395,7 @@ void LLGroupActions::createGroup()
//static
void LLGroupActions::closeGroup(const LLUUID& group_id)
{
auto* floaterp = LLFloaterReg::findInstance("group_profile", LLSD().with("group_id", group_id));
auto* floaterp = LLFloaterReg::findInstance("group_profile", LLSD(group_id));
if (floaterp)
{
floaterp->closeFloater();
......
This diff is collapsed.
......@@ -997,7 +997,7 @@ void LLVOAvatarSelf::idleUpdateTractorBeam()
if(AlchemyBoundingBoxBeam)
{
use_single_beam = false;
for(LLObjectSelection::iterator iter = selection->begin(); iter != selection->end(); iter++)
for(LLObjectSelection::iterator iter = selection->begin(), iter_end = selection->end(); iter != iter_end; iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* object = node->getObject();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment