diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-18 03:42:24 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-18 03:42:24 +0200 |
| commit | 7f883354888b3fb39f19cad7809bd3efea9b457c (patch) | |
| tree | 99b85d6babcaa73b60423dabf1b1c6af240d07ab /indra/newview/llviewerfloaterreg.cpp | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
| parent | 6850b915fe42f5a75fc9d8bb9ca05f961de3244a (diff) | |
Merge remote-tracking branch 'KittyBarnett/texture-preview' into DRTVWR-579-texture-preview
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 59654350e4..77a7fd21a8 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -153,6 +153,7 @@ #include "llinspectgroup.h" #include "llinspectobject.h" #include "llinspectremoteobject.h" +#include "llinspecttexture.h" #include "llinspecttoast.h" #include "llmoveview.h" #include "llfloaterimnearbychat.h" @@ -281,6 +282,7 @@ void LLViewerFloaterReg::registerFloaters() LLInspectAvatarUtil::registerFloater(); LLInspectGroupUtil::registerFloater(); LLInspectObjectUtil::registerFloater(); + LLInspectTextureUtil::registerFloater(); LLInspectRemoteObjectUtil::registerFloater(); LLFloaterVoiceVolumeUtil::registerFloater(); LLNotificationsUI::registerFloater(); |