diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-02 16:59:27 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-02 16:59:27 -0700 |
| commit | 8aadd6c529c1b29cbfe4e2ecf1faa26f0f0f7b3e (patch) | |
| tree | 5f53c8a4467ddb89ded702e13fc0103c01d05a8c /indra/newview | |
| parent | 79deb8c73562301f1bc6cb38167e0da751920b61 (diff) | |
Renaming the floater stinson files to be floater debug materials.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterdebugmaterials.cpp (renamed from indra/newview/llfloaterstinson.cpp) | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterdebugmaterials.h (renamed from indra/newview/llfloaterstinson.h) | 0 | ||||
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 15ab5e6180..9d379063a5 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -191,6 +191,7 @@ set(viewer_SOURCE_FILES llfloaterbuyland.cpp llfloatercamera.cpp llfloatercolorpicker.cpp + llfloaterdebugmaterials.cpp llfloaterdeleteenvpreset.cpp llfloaterdestinations.cpp llfloaterdisplayname.cpp @@ -246,7 +247,6 @@ set(viewer_SOURCE_FILES llfloatersnapshot.cpp llfloatersounddevices.cpp llfloaterspellchecksettings.cpp - llfloaterstinson.cpp llfloatertelehub.cpp llfloatertestinspectors.cpp llfloatertestlistview.cpp @@ -768,6 +768,7 @@ set(viewer_HEADER_FILES llfloaterbuyland.h llfloatercamera.h llfloatercolorpicker.h + llfloaterdebugmaterials.h llfloaterdeleteenvpreset.h llfloaterdestinations.h llfloaterdisplayname.h @@ -823,7 +824,6 @@ set(viewer_HEADER_FILES llfloatersnapshot.h llfloatersounddevices.h llfloaterspellchecksettings.h - llfloaterstinson.h llfloatertelehub.h llfloatertestinspectors.h llfloatertestlistview.h diff --git a/indra/newview/llfloaterstinson.cpp b/indra/newview/llfloaterdebugmaterials.cpp index 54140cf38d..2268360f54 100644 --- a/indra/newview/llfloaterstinson.cpp +++ b/indra/newview/llfloaterdebugmaterials.cpp @@ -27,7 +27,7 @@ #include "llviewerprecompiledheaders.h" -#include "llfloaterstinson.h" +#include "llfloaterdebugmaterials.h" #include <string> #include <vector> diff --git a/indra/newview/llfloaterstinson.h b/indra/newview/llfloaterdebugmaterials.h index 1d906394c1..1d906394c1 100644 --- a/indra/newview/llfloaterstinson.h +++ b/indra/newview/llfloaterdebugmaterials.h diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 9314a3794b..6fe1a7216d 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -50,6 +50,7 @@ #include "llfloaterbump.h" #include "llfloaterbvhpreview.h" #include "llfloatercamera.h" +#include "llfloaterdebugmaterials.h" #include "llfloaterdeleteenvpreset.h" #include "llfloaterdisplayname.h" #include "llfloatereditdaycycle.h" @@ -103,7 +104,6 @@ #include "llfloatersnapshot.h" #include "llfloatersounddevices.h" #include "llfloaterspellchecksettings.h" -#include "llfloaterstinson.h" #include "llfloatertelehub.h" #include "llfloatertestinspectors.h" #include "llfloatertestlistview.h" |