summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
committerBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
commit3c521d8207092f1c48e158082b88c5e81cc9c440 (patch)
tree36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/newview/lltexturectrl.cpp
parent74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
viewer-release merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rwxr-xr-xindra/newview/lltexturectrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 2b1ed5858a..4300cafb6b 100755
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -134,7 +134,7 @@ public:
void updateFilterPermMask();
void commitIfImmediateSet();
void commitCancel();
-
+
void onFilterEdit(const std::string& search_string );
void setCanApply(bool can_preview, bool can_apply);