summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-29 21:42:44 -0500
committerDave Parks <davep@lindenlab.com>2022-06-29 21:42:44 -0500
commit6f6df8ed71702f0ee8d21a2b583818ae360dd093 (patch)
tree70545286267ecc4419b7d1dfe463c6d08490775a /indra/newview/llmaterialeditor.cpp
parent56ae3e0a083aefcbd6d7c955bb2c7e9e58000a4b (diff)
SL-17685 Drag and drop material support
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
-rw-r--r--indra/newview/llmaterialeditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 2455ad2926..9fb9f723cd 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -43,7 +43,6 @@
#include "llviewerregion.h"
#include "llvovolume.h"
#include "roles_constants.h"
-#include "tinygltf/tiny_gltf.h"
#include "llviewerobjectlist.h"
#include "llfloaterreg.h"
#include "llfilesystem.h"
@@ -52,6 +51,7 @@
#include "llviewertexturelist.h"
#include "llfloaterperms.h"
+#include "tinygltf/tiny_gltf.h"
#include <strstream>
///----------------------------------------------------------------------------