diff options
author | Oz Linden <oz@lindenlab.com> | 2016-11-16 09:52:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-11-16 09:52:59 -0500 |
commit | fd2ccb16068dfd21307b17e78e384d8ae19fef12 (patch) | |
tree | 3e40dcddd3117820008047b81ec218e9cc0ffb7c /indra/newview/llfloaterscriptlimits.h | |
parent | 8baf88a073f30d217e03ee56b4a255121ac98071 (diff) | |
parent | ecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff) |
merge changes for 4.1.2-release
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
-rw-r--r-- | indra/newview/llfloaterscriptlimits.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h index e3cbbd185f..2ac3862b4f 100644 --- a/indra/newview/llfloaterscriptlimits.h +++ b/indra/newview/llfloaterscriptlimits.h @@ -113,6 +113,7 @@ public: void showBeacon(); void returnObjectsFromParcel(S32 local_id); void returnObjects(); + void checkButtonsEnabled(); private: void onNameCache(const LLUUID& id, |