summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.h
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-09-17 16:01:11 +0000
committerJosh Bell <josh@lindenlab.com>2007-09-17 16:01:11 +0000
commite3d0761b5eb2ead6ccaa1bcd871b754c5e5ff65c (patch)
tree51979eb7811ff3cdf61b9241b342f5482f9737f6 /indra/newview/llimpanel.h
parent13c391f1984bb8cb9d67a7729af2ee5714409215 (diff)
svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.
Diffstat (limited to 'indra/newview/llimpanel.h')
-rw-r--r--indra/newview/llimpanel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index f780bcb2bb..dbe09fb396 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -187,7 +187,6 @@ public:
static void onClickProfile( void* userdata );
static void onClickGroupInfo( void* userdata );
- static void onClickOfferTeleport( void* userdata );
static void onClickClose( void* userdata );
static void onClickStartCall( void* userdata );
static void onClickEndCall( void* userdata );