diff options
| author | Cho <cho@lindenlab.com> | 2013-02-08 02:03:28 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-02-08 02:03:28 +0000 |
| commit | c55e4a61242cd3cf94e0a28398fd33a4eb8ea683 (patch) | |
| tree | abf3e7749d69de6ae0fc6d21fef7f428abc8bc69 /indra/llui/lldockcontrol.h | |
| parent | 3016afcd0623d8c086cfee36ebf5a0b3210c6fa5 (diff) | |
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation
Changed LLPersistentNotificationStorage::saveNotification() to use notification->asLLSD(true) to skip duplicates
Changed LLDockControl::mDockWidget to be a LLHandle<LLView> instead of a LLView* to fix crash (from accessing deleted LLView)
Diffstat (limited to 'indra/llui/lldockcontrol.h')
| -rw-r--r-- | indra/llui/lldockcontrol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h index c9602011f6..a1cfa0072c 100644 --- a/indra/llui/lldockcontrol.h +++ b/indra/llui/lldockcontrol.h @@ -63,7 +63,7 @@ public: void setDock(LLView* dockWidget); LLView* getDock() { - return mDockWidget; + return mDockWidget.get(); } void repositionDockable(); void drawToungue(); @@ -83,7 +83,7 @@ private: bool mRecalculateDockablePosition; bool mDockWidgetVisible; DocAt mDockAt; - LLView* mDockWidget; + LLHandle<LLView> mDockWidget; LLRect mPrevDockRect; LLRect mRootRect; LLRect mFloaterRect; |