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
2798c355
Commit
2798c355
authored
11 years ago
by
prep@lindenlab.com
Browse files
Options
Downloads
Patches
Plain Diff
SH-4035:Added ignore message to notification
parent
24fa7736
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/llsidepanelappearance.cpp
+1
-5
1 addition, 5 deletions
indra/newview/llsidepanelappearance.cpp
indra/newview/skins/default/xui/en/notifications.xml
+4
-3
4 additions, 3 deletions
indra/newview/skins/default/xui/en/notifications.xml
with
5 additions
and
8 deletions
indra/newview/llsidepanelappearance.cpp
+
1
−
5
View file @
2798c355
...
@@ -77,13 +77,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaBack(const LLSD& notificat
...
@@ -77,13 +77,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaBack(const LLSD& notificat
S32
option
=
LLNotificationsUtil
::
getSelectedOption
(
notification
,
response
);
S32
option
=
LLNotificationsUtil
::
getSelectedOption
(
notification
,
response
);
if
(
option
==
0
)
if
(
option
==
0
)
{
{
gSavedSettings
.
setBOOL
(
"ExitOutfitEditWithoutSave"
,
TRUE
);
LLAppearanceMgr
::
instance
().
setOutfitDirty
(
true
);
LLAppearanceMgr
::
instance
().
setOutfitDirty
(
true
);
showOutfitsInventoryPanel
();
showOutfitsInventoryPanel
();
LLAppearanceMgr
::
getInstance
()
->
wearBaseOutfit
();
LLAppearanceMgr
::
getInstance
()
->
wearBaseOutfit
();
return
true
;
return
true
;
}
}
gSavedSettings
.
setBOOL
(
"ExitOutfitEditWithoutSave"
,
FALSE
);
return
false
;
return
false
;
}
}
...
@@ -91,13 +89,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
...
@@ -91,13 +89,11 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
{
{
S32
option
=
LLNotificationsUtil
::
getSelectedOption
(
notification
,
response
);
S32
option
=
LLNotificationsUtil
::
getSelectedOption
(
notification
,
response
);
if
(
option
==
0
)
if
(
option
==
0
)
{
{
gSavedSettings
.
setBOOL
(
"ExitOutfitEditWithoutSave"
,
TRUE
);
LLAppearanceMgr
::
getInstance
()
->
wearBaseOutfit
();
LLAppearanceMgr
::
getInstance
()
->
wearBaseOutfit
();
mLLFloaterSidePanelContainer
->
close
();
mLLFloaterSidePanelContainer
->
close
();
return
true
;
return
true
;
}
}
gSavedSettings
.
setBOOL
(
"ExitOutfitEditWithoutSave"
,
FALSE
);
return
false
;
return
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/notifications.xml
+
4
−
3
View file @
2798c355
...
@@ -10039,9 +10039,10 @@ Cannot create large prims that intersect other players. Please re-try when othe
...
@@ -10039,9 +10039,10 @@ Cannot create large prims that intersect other players. Please re-try when othe
Closing this window will discard any changes you have made.
Closing this window will discard any changes you have made.
<tag>
confirm
</tag>
<tag>
confirm
</tag>
<usetemplate
<usetemplate
name=
"okcancel
buttons
"
name=
"okcancel
ignore
"
notext=
"Cancel"
notext=
"Cancel"
yestext=
"OK"
/>
yestext=
"OK"
ignoretext=
"Don't show me this again."
/>
</notification>
</notification>
</notifications>
</notifications>
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