summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelvolume.cpp19
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
2 files changed, 3 insertions, 18 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index d47383b29a..b1d3ac2245 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -746,21 +746,6 @@ void LLPanelVolume::sendIsLight()
LL_INFOS() << "update light sent" << LL_ENDL;
}
-void notify_cant_select_reflection_probe()
-{
- static bool show_notification = true;
- if (show_notification)
- {
- // show only once per session if not ignored
- show_notification = false;
- if (!gSavedSettings.getBOOL("SelectReflectionProbes"))
- {
- LLNotificationsUtil::add("CantSelectReflectionProbe");
- }
- // else: user used the setting, don't show again this session
- }
-}
-
void LLPanelVolume::sendIsReflectionProbe()
{
LLViewerObject* objectp = mObject;
@@ -779,7 +764,7 @@ void LLPanelVolume::sendIsReflectionProbe()
}
else
{
- notify_cant_select_reflection_probe();
+ LLNotificationsUtil::add("CantSelectReflectionProbe");
volobjp->setIsReflectionProbe(value);
}
}
@@ -796,7 +781,7 @@ void LLPanelVolume::doSendIsReflectionProbe(const LLSD & notification, const LLS
}
LLVOVolume* volobjp = (LLVOVolume*)objectp;
- notify_cant_select_reflection_probe();
+ LLNotificationsUtil::add("CantSelectReflectionProbe");
volobjp->setIsReflectionProbe(true);
{ // has become a reflection probe, slam to a 10m sphere and pop up a message
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 16fc79b77d..6c841ac049 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7018,7 +7018,7 @@ Please try again.
name="CantSelectReflectionProbe"
type="alertmodal">
<unique/>
- You have placed a reflection probe, but option for selecting reflection probes is disabled. To be able to select reflection probes enable Build &gt; Options &gt; Select Reflection Probes.
+ You have placed a reflection probe, but 'Select Reflection Probes' is disabled. To be able to select reflection probes, check Build &gt; Options &gt; Select Reflection Probes.
<tag>confirm</tag>
<usetemplate
ignoretext="Don't show again."