diff options
| author | Jacek Antonelli | 2008-10-03 02:21:33 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-03 15:27:46 -0500 |
| commit | f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6 (patch) | |
| tree | 3e6c0dd5415915a14b5cd00747f4615d9f506570 /linden/indra/newview/llpanelavatar.cpp | |
| parent | Added .gitignore to ignore artwork, libs, and compiled stuff. (diff) | |
| parent | 'Offer Teleport' button in friends list is now enabled (diff) | |
| download | meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.zip meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.gz meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.bz2 meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.xz | |
Merge branch 'offer-teleport' into next
Diffstat (limited to 'linden/indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index 7b21a15..76dbd1f 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
| @@ -1318,7 +1318,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) | |||
| 1318 | } | 1318 | } |
| 1319 | else | 1319 | else |
| 1320 | { | 1320 | { |
| 1321 | childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES)); | 1321 | childSetEnabled("Offer Teleport...", TRUE); |
| 1322 | childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); | 1322 | childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); |
| 1323 | } | 1323 | } |
| 1324 | } | 1324 | } |