diff options
| author | David Walter Seikel | 2011-12-03 18:50:34 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2011-12-03 18:50:34 +1000 |
| commit | d3b9f715f0ad9516fa350a5c0b83330b733ee0f9 (patch) | |
| tree | e1481a7b83ae6f4fa0a88c4eebb6dbecd83e86fd /linden/indra/newview/llfilepicker.h | |
| parent | Another possible fix for misplaced HUDs? (diff) | |
| parent | Made the voice license window resizable (diff) | |
| download | meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.zip meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.gz meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.bz2 meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.xz | |
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious.
Conflicts:
.gitignore
linden/indra/cmake/00-Common.cmake
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerinfo.cpp
The usual branding conflicts.
Diffstat (limited to 'linden/indra/newview/llfilepicker.h')
| -rw-r--r-- | linden/indra/newview/llfilepicker.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h index fb20ed3..3925ae7 100644 --- a/linden/indra/newview/llfilepicker.h +++ b/linden/indra/newview/llfilepicker.h | |||
| @@ -92,6 +92,7 @@ public: | |||
| 92 | FFLOAD_SLOBJECT = 7, | 92 | FFLOAD_SLOBJECT = 7, |
| 93 | FFLOAD_RAW = 8, | 93 | FFLOAD_RAW = 8, |
| 94 | FFLOAD_TEXT = 9, | 94 | FFLOAD_TEXT = 9, |
| 95 | FFLOAD_APP = 10 | ||
| 95 | }; | 96 | }; |
| 96 | 97 | ||
| 97 | enum ESaveFilter | 98 | enum ESaveFilter |