Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
d0695ee1
"git@git.alchemyviewer.org:JennaHuntsman/xdg-integration.git" did not exist on "1e494f3fefd43918ddfdcb2c20db263f502fd66a"
Commit
d0695ee1
authored
13 years ago
by
Richard Linden
Browse files
Options
Downloads
Patches
Plain Diff
EXP-1465 FIX Crash in IM panel destructor
parent
35b8f7b1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llimfloatercontainer.cpp
+2
-1
2 additions, 1 deletion
indra/newview/llimfloatercontainer.cpp
indra/newview/llimfloatercontainer.h
+1
-1
1 addition, 1 deletion
indra/newview/llimfloatercontainer.h
with
3 additions
and
2 deletions
indra/newview/llimfloatercontainer.cpp
+
2
−
1
View file @
d0695ee1
...
...
@@ -47,12 +47,13 @@ LLIMFloaterContainer::LLIMFloaterContainer(const LLSD& seed)
LLIMFloaterContainer
::~
LLIMFloaterContainer
()
{
mNewMessageConnection
.
disconnect
();
LLTransientFloaterMgr
::
getInstance
()
->
removeControlView
(
LLTransientFloaterMgr
::
IM
,
this
);
}
BOOL
LLIMFloaterContainer
::
postBuild
()
{
LLIMModel
::
instance
().
mNewMsgSignal
.
connect
(
boost
::
bind
(
&
LLIMFloaterContainer
::
onNewMessageReceived
,
this
,
_1
));
mNewMessageConnection
=
LLIMModel
::
instance
().
mNewMsgSignal
.
connect
(
boost
::
bind
(
&
LLIMFloaterContainer
::
onNewMessageReceived
,
this
,
_1
));
// Do not call base postBuild to not connect to mCloseSignal to not close all floaters via Close button
// mTabContainer will be initialized in LLMultiFloater::addChild()
return
TRUE
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llimfloatercontainer.h
+
1
−
1
View file @
d0695ee1
...
...
@@ -62,7 +62,7 @@ class LLIMFloaterContainer : public LLMultiFloater
private:
typedef
std
::
map
<
LLUUID
,
LLFloater
*>
avatarID_panel_map_t
;
avatarID_panel_map_t
mSessions
;
boost
::
signals2
::
connection
mNewMessageConnection
;
void
onNewMessageReceived
(
const
LLSD
&
data
);
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment