summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2014-01-14 23:45:55 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2014-01-14 23:45:55 +0200
commit724b5f12221509cc00ce6a6560d3df89d9c79b16 (patch)
treee1ed59aa0f2514af7c23396241e8728286edc142 /indra
parent4d81b1d967fbfa68f97f37d8d162b1ac9900a4b0 (diff)
parenta462c5f14b14ede2f159b872366dd577531c58f2 (diff)
merge
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfilepicker.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 7fa3e176b0..3064d96434 100755
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -570,6 +570,7 @@ std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) //
allowedv->push_back("lsl");
allowedv->push_back("dic");
allowedv->push_back("xcu");
+ allowedv->push_back("gif");
case FFLOAD_IMAGE:
allowedv->push_back("jpg");
allowedv->push_back("jpeg");