diff options
author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-08-16 20:40:57 +0300 |
---|---|---|
committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2016-08-16 20:40:57 +0300 |
commit | 05e77c5f261f2620519dfc6eda845307849308a7 (patch) | |
tree | 5c607f3e30a4f14070ec0efc84628ec654aaa3a7 /indra/newview/llpanelpeoplemenus.h | |
parent | b496e4ff156ab2fb055e741b97ceda5751476e7f (diff) | |
parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) |
Merge VOB with 4.0.8-release
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.h')
-rw-r--r-- | indra/newview/llpanelpeoplemenus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeoplemenus.h b/indra/newview/llpanelpeoplemenus.h index 9767bab89f..5ed20e0064 100644 --- a/indra/newview/llpanelpeoplemenus.h +++ b/indra/newview/llpanelpeoplemenus.h @@ -46,7 +46,9 @@ protected: private: bool enableContextMenuItem(const LLSD& userdata); bool checkContextMenuItem(const LLSD& userdata); + bool enableFreezeEject(const LLSD& userdata); void offerTeleport(); + void eject(); void startConference(); void requestTeleport(); }; |