diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-11-28 14:31:27 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 14:31:27 +0200 | 
| commit | f9cba58fe203ac53823ee3b5a7ded444b7106783 (patch) | |
| tree | 2c5ace986ebf734604ab9e5bc5a55a1a5f437050 | |
| parent | 86df22a031527ffb8edbcc5bca93a2e7735dfae6 (diff) | |
SL-20645 don't show the warning when 'Select Reflection Probes' is enabled
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 12 | 
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index f58aab3080..595609b4de 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -746,6 +746,14 @@ void LLPanelVolume::sendIsLight()  	LL_INFOS() << "update light sent" << LL_ENDL;  } +void notify_cant_select_reflection_probe() +{ +    if (!gSavedSettings.getBOOL("SelectReflectionProbes")) +    { +        LLNotificationsUtil::add("CantSelectReflectionProbe"); +    } +} +  void LLPanelVolume::sendIsReflectionProbe()  {      LLViewerObject* objectp = mObject; @@ -766,7 +774,7 @@ void LLPanelVolume::sendIsReflectionProbe()      {          if (value)          { -            LLNotificationsUtil::add("CantSelectReflectionProbe"); +            notify_cant_select_reflection_probe();          }          else if (objectp->flagPhantom())          { @@ -794,7 +802,7 @@ void LLPanelVolume::doSendIsReflectionProbe(const LLSD & notification, const LLS          }          LLVOVolume* volobjp = (LLVOVolume*)objectp; -        LLNotificationsUtil::add("CantSelectReflectionProbe"); +        notify_cant_select_reflection_probe();          volobjp->setIsReflectionProbe(true);          { // has become a reflection probe, slam to a 10m sphere and pop up a message  | 
