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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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 Archive
Alchemy Viewer
Commits
1dea2536
Commit
1dea2536
authored
14 years ago
by
Tofu Linden
Browse files
Options
Downloads
Plain Diff
merge storm-114
parents
03891889
9e49a530
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/llchathistory.cpp
+1
-1
1 addition, 1 deletion
indra/newview/llchathistory.cpp
indra/newview/lltoastnotifypanel.cpp
+5
-3
5 additions, 3 deletions
indra/newview/lltoastnotifypanel.cpp
indra/newview/lltoastnotifypanel.h
+2
-2
2 additions, 2 deletions
indra/newview/lltoastnotifypanel.h
with
8 additions
and
6 deletions
indra/newview/llchathistory.cpp
+
1
−
1
View file @
1dea2536
...
@@ -760,7 +760,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
...
@@ -760,7 +760,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
if
(
notification
!=
NULL
)
if
(
notification
!=
NULL
)
{
{
LLIMToastNotifyPanel
*
notify_box
=
new
LLIMToastNotifyPanel
(
LLIMToastNotifyPanel
*
notify_box
=
new
LLIMToastNotifyPanel
(
notification
,
chat
.
mSessionID
);
notification
,
chat
.
mSessionID
,
LLRect
::
null
,
!
use_plain_text_chat_history
);
//we can't set follows in xml since it broke toasts behavior
//we can't set follows in xml since it broke toasts behavior
notify_box
->
setFollowsLeft
();
notify_box
->
setFollowsLeft
();
notify_box
->
setFollowsRight
();
notify_box
->
setFollowsRight
();
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lltoastnotifypanel.cpp
+
5
−
3
View file @
1dea2536
...
@@ -51,7 +51,7 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL;
...
@@ -51,7 +51,7 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL;
LLToastNotifyPanel
::
button_click_signal_t
LLToastNotifyPanel
::
sButtonClickSignal
;
LLToastNotifyPanel
::
button_click_signal_t
LLToastNotifyPanel
::
sButtonClickSignal
;
LLToastNotifyPanel
::
LLToastNotifyPanel
(
LLNotificationPtr
&
notification
,
const
LLRect
&
rect
)
:
LLToastNotifyPanel
::
LLToastNotifyPanel
(
LLNotificationPtr
&
notification
,
const
LLRect
&
rect
,
bool
show_images
)
:
LLToastPanel
(
notification
),
LLToastPanel
(
notification
),
mTextBox
(
NULL
),
mTextBox
(
NULL
),
mInfoPanel
(
NULL
),
mInfoPanel
(
NULL
),
...
@@ -120,6 +120,7 @@ mCloseNotificationOnDestroy(true)
...
@@ -120,6 +120,7 @@ mCloseNotificationOnDestroy(true)
mTextBox
->
setMaxTextLength
(
MAX_LENGTH
);
mTextBox
->
setMaxTextLength
(
MAX_LENGTH
);
mTextBox
->
setVisible
(
TRUE
);
mTextBox
->
setVisible
(
TRUE
);
mTextBox
->
setPlainText
(
!
show_images
);
mTextBox
->
setValue
(
notification
->
getMessage
());
mTextBox
->
setValue
(
notification
->
getMessage
());
// add buttons for a script notification
// add buttons for a script notification
...
@@ -523,8 +524,9 @@ void LLToastNotifyPanel::disableRespondedOptions(LLNotificationPtr& notification
...
@@ -523,8 +524,9 @@ void LLToastNotifyPanel::disableRespondedOptions(LLNotificationPtr& notification
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
LLIMToastNotifyPanel
::
LLIMToastNotifyPanel
(
LLNotificationPtr
&
pNotification
,
const
LLUUID
&
session_id
,
const
LLRect
&
rect
/* = LLRect::null */
)
LLIMToastNotifyPanel
::
LLIMToastNotifyPanel
(
LLNotificationPtr
&
pNotification
,
const
LLUUID
&
session_id
,
const
LLRect
&
rect
/* = LLRect::null */
,
:
mSessionID
(
session_id
),
LLToastNotifyPanel
(
pNotification
,
rect
)
bool
show_images
/* = true */
)
:
mSessionID
(
session_id
),
LLToastNotifyPanel
(
pNotification
,
rect
,
show_images
)
{
{
mTextBox
->
setFollowsAll
();
mTextBox
->
setFollowsAll
();
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lltoastnotifypanel.h
+
2
−
2
View file @
1dea2536
...
@@ -60,7 +60,7 @@ public:
...
@@ -60,7 +60,7 @@ public:
* @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to
* @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to
* implement right class for desired toast panel. @see LLGenericTipPanel as example.
* implement right class for desired toast panel. @see LLGenericTipPanel as example.
*/
*/
LLToastNotifyPanel
(
LLNotificationPtr
&
pNotification
,
const
LLRect
&
rect
=
LLRect
::
null
);
LLToastNotifyPanel
(
LLNotificationPtr
&
pNotification
,
const
LLRect
&
rect
=
LLRect
::
null
,
bool
show_images
=
true
);
virtual
~
LLToastNotifyPanel
();
virtual
~
LLToastNotifyPanel
();
LLPanel
*
getControlPanel
()
{
return
mControlPanel
;
}
LLPanel
*
getControlPanel
()
{
return
mControlPanel
;
}
...
@@ -137,7 +137,7 @@ class LLIMToastNotifyPanel : public LLToastNotifyPanel
...
@@ -137,7 +137,7 @@ class LLIMToastNotifyPanel : public LLToastNotifyPanel
{
{
public:
public:
LLIMToastNotifyPanel
(
LLNotificationPtr
&
pNotification
,
const
LLUUID
&
session_id
,
const
LLRect
&
rect
=
LLRect
::
null
);
LLIMToastNotifyPanel
(
LLNotificationPtr
&
pNotification
,
const
LLUUID
&
session_id
,
const
LLRect
&
rect
=
LLRect
::
null
,
bool
show_images
=
true
);
~
LLIMToastNotifyPanel
();
~
LLIMToastNotifyPanel
();
...
...
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