STORM-1893: 'share' function (in friends-list) doesn't bring up the residents' IM window when it's minimized
Review Request #589 - Created July 2, 2012 and submitted
| MartinRJ Fayray | Reviewers | ||
| 3.3.3 | viewer | ||
| STORM-1893 | |||
| None | viewer-release | ||
Repository is here: https://bitbucket.org/MartinRJ/storm-1893 I just added two calls to show() and setVisible() in LLAvatarActions::share to bring the IM window to front even when it's minimized.
Please see the test plan in the Jira.
Diff revision 1
This is not the most recent revision of the diff. The latest diff is revision 2. See what's changed.
|
1
2
|
|
|
1
2
|
Expand changes
Hide Extra Whitespace| indra/newview/llavataractions.cpp | |||
|---|---|---|---|
| Revision 4d9106153407 | New Change | ||
| ... | 451 lines hidden [Expand] | ||
void LLAvatarActions::share(const LLUUID& id) |
|||
| 452 |
LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,id); |
452 |
LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,id); |
| 453 | 453 | ||
| 454 |
if (!gIMMgr->hasSession(session_id)) |
454 |
if (!gIMMgr->hasSession(session_id)) |
| 455 |
{ |
455 |
{ |
| 456 |
startIM(id); |
456 |
startIM(id); |
| 457 |
} |
457 |
} |
| 458 | 458 | ||
| 459 |
if (gIMMgr->hasSession(session_id)) |
459 |
if (gIMMgr->hasSession(session_id)) |
| 460 |
{ |
460 |
{ |
| 461 |
// we should always get here, but check to verify anyways |
461 |
// we should always get here, but check to verify anyways |
| 462 |
LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); |
||
| 463 |
im_floater->show(session_id); |
||
| 464 |
im_floater->setVisible(true); |
||
| 462 |
LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false); |
465 |
LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false); |
| 463 |
} |
466 |
} |
| 464 |
}
|
467 |
}
|
| 465 | 468 | ||
| 466 |
namespace action_give_inventory |
469 |
namespace action_give_inventory |
| 467 |
{
|
470 |
{
|
| 468 |
/** |
471 |
/** |
| 469 |
* Returns a pointer to 'Add More' inventory panel of Edit Outfit SP.
|
472 |
* Returns a pointer to 'Add More' inventory panel of Edit Outfit SP.
|
| 470 |
*/
|
473 |
*/
|
| 471 |
static LLInventoryPanel* get_outfit_editor_inventory_panel() |
474 |
static LLInventoryPanel* get_outfit_editor_inventory_panel() |
| ... | 573 lines hidden [Expand] | ||
Other reviews