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
a555f635
Commit
a555f635
authored
10 years ago
by
Mnikolenko ProductEngine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-729 FIXED Hide popup menu (which belongs to old chiclet) when new chiclet arrives.
parent
c7c62b96
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llchiclet.cpp
+8
-0
8 additions, 0 deletions
indra/newview/llchiclet.cpp
indra/newview/llchiclet.h
+2
-0
2 additions, 0 deletions
indra/newview/llchiclet.h
indra/newview/llscriptfloater.cpp
+1
-0
1 addition, 0 deletions
indra/newview/llscriptfloater.cpp
with
11 additions
and
0 deletions
indra/newview/llchiclet.cpp
+
8
−
0
View file @
a555f635
...
@@ -376,6 +376,14 @@ BOOL LLIMChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask)
...
@@ -376,6 +376,14 @@ BOOL LLIMChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask)
return
TRUE
;
return
TRUE
;
}
}
void
LLIMChiclet
::
hidePopupMenu
()
{
if
(
mPopupMenu
)
{
mPopupMenu
->
setVisible
(
FALSE
);
}
}
bool
LLIMChiclet
::
canCreateMenu
()
bool
LLIMChiclet
::
canCreateMenu
()
{
{
if
(
mPopupMenu
)
if
(
mPopupMenu
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llchiclet.h
+
2
−
0
View file @
a555f635
...
@@ -305,6 +305,8 @@ class LLIMChiclet : public LLChiclet
...
@@ -305,6 +305,8 @@ class LLIMChiclet : public LLChiclet
*/
*/
virtual
BOOL
handleRightMouseDown
(
S32
x
,
S32
y
,
MASK
mask
);
virtual
BOOL
handleRightMouseDown
(
S32
x
,
S32
y
,
MASK
mask
);
void
hidePopupMenu
();
protected
:
protected
:
LLIMChiclet
(
const
LLIMChiclet
::
Params
&
p
);
LLIMChiclet
(
const
LLIMChiclet
::
Params
&
p
);
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llscriptfloater.cpp
+
1
−
0
View file @
a555f635
...
@@ -378,6 +378,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
...
@@ -378,6 +378,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
{
{
// Pass the new_message icon state further.
// Pass the new_message icon state further.
set_new_message
=
chicletp
->
getShowNewMessagesIcon
();
set_new_message
=
chicletp
->
getShowNewMessagesIcon
();
chicletp
->
hidePopupMenu
();
}
}
}
}
...
...
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