diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
| commit | 98a89748789034a53f129e19d06649d79b384c52 (patch) | |
| tree | 39a1aefb35402db02c8791bc3e5735c36116f426 /indra/newview/lltexturectrl.cpp | |
| parent | 796be733b374beb5660ee2713fc28c4e69331cbd (diff) | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rwxr-xr-x | indra/newview/lltexturectrl.cpp | 2 |
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); |