diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloatertelehub.h | |
parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloatertelehub.h')
-rw-r--r-- | indra/newview/llfloatertelehub.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatertelehub.h b/indra/newview/llfloatertelehub.h index b639338dfc..86749dcc0b 100644 --- a/indra/newview/llfloatertelehub.h +++ b/indra/newview/llfloatertelehub.h @@ -49,6 +49,7 @@ public: virtual void draw(); /*virtual*/ BOOL postBuild(); + void onOpen(const LLSD& key); static BOOL renderBeacons(); static void addBeacons(); |