diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-13 11:10:40 -0700 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-13 11:10:40 -0700 |
commit | 7cd5f7d479b889c3dcdb4bcd0ee6b65b5b5a025f (patch) | |
tree | f0ec4e77540edd8680f41ae1719e9b66f279fd60 /indra/newview/llfloatertopobjects.h | |
parent | e86b1c18db0629d64f8bf26fcf69e64072d084e6 (diff) | |
parent | 3a56fbf867194ec8fbc7d8237f9781ac9d72c8a4 (diff) |
Merge from lindenlab/viewmaster so we can get rid of it
Diffstat (limited to 'indra/newview/llfloatertopobjects.h')
-rw-r--r-- | indra/newview/llfloatertopobjects.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h index a608ca20f1..6edc46cf79 100644 --- a/indra/newview/llfloatertopobjects.h +++ b/indra/newview/llfloatertopobjects.h @@ -73,9 +73,7 @@ private: void onGetByOwnerName(); void onGetByObjectName(); - -// static void onGetByOwnerNameClicked(void* data) { onGetByOwnerName(NULL, data); }; -// static void onGetByObjectNameClicked(void* data) { onGetByObjectName(NULL, data); }; + void onGetByParcelName(); void showBeacon(); |