livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-20569 Notify user when reflection probe can't be selected #2

meow-7.2.2
Andrey Kleshchev 2023-11-08 02:05:33 +02:00 committed by akleshchev
parent de844bfce1
commit 901de39ca7
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llpanelvolume.cpp
View File

@ -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

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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."