diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
| commit | 69ff937e47248eca0a4f876efebe97ee57bd4da9 (patch) | |
| tree | 4fde61ed0ed439b0bf033b15f6703d72bee6f561 /indra/newview/llfloaterbump.h | |
| parent | 9367a3787929dfff8b46763d9a7b4872c469e85a (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llfloaterbump.h')
| -rwxr-xr-x | indra/newview/llfloaterbump.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h index 11b7db9fee..ce52c75255 100755 --- a/indra/newview/llfloaterbump.h +++ b/indra/newview/llfloaterbump.h @@ -46,6 +46,10 @@ public: /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); + static LLFloaterBump* getInstance(); + + void populateCollisionList(); + void startIM(); void startCall(); void reportAbuse(); |