diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-11-07 23:20:40 +0200 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-11-08 20:21:24 +0200 |
| commit | de844bfce11ea46d428d775d377460db8a2cf54b (patch) | |
| tree | 9fee59e69000e07a4a309a4e0f64bfe3ae54ea1d | |
| parent | e7b71cd8a10898320cf3e0aebc05bfdec3d2ffa3 (diff) | |
SL-20569 Notify user when reflection probe can't be selected
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 13 |
2 files changed, 30 insertions, 0 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index d6c36bbfb7..d47383b29a 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -746,6 +746,21 @@ 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; @@ -764,6 +779,7 @@ void LLPanelVolume::sendIsReflectionProbe() } else { + notify_cant_select_reflection_probe(); volobjp->setIsReflectionProbe(value); } } @@ -780,6 +796,7 @@ void LLPanelVolume::doSendIsReflectionProbe(const LLSD & notification, const LLS } LLVOVolume* volobjp = (LLVOVolume*)objectp; + notify_cant_select_reflection_probe(); 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 d1838fc7ef..16fc79b77d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7014,6 +7014,19 @@ Please try again. </notification> <notification + icon="alertmodal.tga" + 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 > Options > Select Reflection Probes. + <tag>confirm</tag> + <usetemplate + ignoretext="Don't show again." + name="okignore" + yestext="OK"/> + </notification> + + <notification icon="notifytip.tga" name="ScriptMissing" type="notifytip"> |