From e8d1ddb22545fa2abc0400d7af64e82c79fffa95 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Wed, 22 Sep 2010 18:09:17 -0400
Subject: SH-188 FIX crash in llvoavatar.cpp
We were using a NULL pointer after checking it. Did some logic juggling to
ensure that we only use the pointer if it is non-null
Code reviewed by Seraph
(transplanted from a90fe10ddac9545249c6f218af438a36bcbc3162)
---
indra/newview/llvoavatar.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 46d8f65d23..c31714de5a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6089,9 +6089,9 @@ void LLVOAvatar::updateMeshTextures()
// use the last-known good baked texture until it finish the first
// render of the new layerset.
- const BOOL layerset_invalid = !mBakedTextureDatas[i].mTexLayerSet
- || !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized()
- || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable();
+ const BOOL layerset_invalid = mBakedTextureDatas[i].mTexLayerSet
+ && ( !mBakedTextureDatas[i].mTexLayerSet->getComposite()->isInitialized()
+ || !mBakedTextureDatas[i].mTexLayerSet->isLocalTextureDataAvailable() );
use_lkg_baked_layer[i] = (!is_layer_baked[i]
&& (mBakedTextureDatas[i].mLastTextureIndex != IMG_DEFAULT_AVATAR)
--
cgit v1.2.3
From 45cebd19dd365dc1d921d06a33864872b682f448 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 23 Sep 2010 12:13:43 +0100
Subject: STORM-128 FIXED New friends list permission icons
* Added new icon artwork.
* Reordered the icons so that the most common ones are to the right, so that they change position as little as possible.
* Removed old 1.23 icons.
(transplanted from 5ed5fa607e2ce3eaabc8f9716bd4a6ef5933aa64)
---
indra/newview/llavatarlistitem.cpp | 24 ++++-----
indra/newview/llavatarlistitem.h | 6 +--
indra/newview/skins/default/textures/edit_mine.png | Bin 0 -> 639 bytes
.../newview/skins/default/textures/edit_theirs.png | Bin 0 -> 634 bytes
.../skins/default/textures/ff_edit_mine.tga | Bin 1068 -> 0 bytes
.../skins/default/textures/ff_edit_mine_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/ff_edit_theirs.tga | Bin 1068 -> 0 bytes
.../default/textures/ff_edit_theirs_button.tga | Bin 4140 -> 0 bytes
.../default/textures/ff_online_status_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/ff_visible_map.tga | Bin 812 -> 0 bytes
.../default/textures/ff_visible_map_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/ff_visible_online.tga | Bin 1068 -> 0 bytes
.../default/textures/ff_visible_online_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/see_me_online.png | Bin 0 -> 330 bytes
.../newview/skins/default/textures/see_on_map.png | Bin 0 -> 613 bytes
indra/newview/skins/default/textures/textures.xml | 8 +--
.../default/xui/en/panel_avatar_list_item.xml | 55 +++++++++++----------
17 files changed, 49 insertions(+), 44 deletions(-)
create mode 100644 indra/newview/skins/default/textures/edit_mine.png
create mode 100644 indra/newview/skins/default/textures/edit_theirs.png
delete mode 100644 indra/newview/skins/default/textures/ff_edit_mine.tga
delete mode 100644 indra/newview/skins/default/textures/ff_edit_mine_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_edit_theirs.tga
delete mode 100644 indra/newview/skins/default/textures/ff_edit_theirs_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_online_status_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_map.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_map_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_online.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_online_button.tga
create mode 100644 indra/newview/skins/default/textures/see_me_online.png
create mode 100644 indra/newview/skins/default/textures/see_on_map.png
(limited to 'indra/newview')
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 8fc4ad6763..06ac189cbd 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -449,20 +449,20 @@ void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
//info btn width + padding
S32 info_btn_width = avatar_item->mProfileBtn->getRect().mLeft - avatar_item->mInfoBtn->getRect().mLeft;
- // edit their objects permission icon width + padding
- S32 permission_edit_theirs_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mIconPermissionEditTheirs->getRect().mLeft;
-
- // edit my objects permission icon width + padding
- S32 permission_edit_mine_width = avatar_item->mIconPermissionEditTheirs->getRect().mLeft - avatar_item->mIconPermissionEditMine->getRect().mLeft;
+ // online permission icon width + padding
+ S32 permission_online_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mIconPermissionOnline->getRect().mLeft;
// map permission icon width + padding
- S32 permission_map_width = avatar_item->mIconPermissionEditMine->getRect().mLeft - avatar_item->mIconPermissionMap->getRect().mLeft;
+ S32 permission_map_width = avatar_item->mIconPermissionOnline->getRect().mLeft - avatar_item->mIconPermissionMap->getRect().mLeft;
- // online permission icon width + padding
- S32 permission_online_width = avatar_item->mIconPermissionMap->getRect().mLeft - avatar_item->mIconPermissionOnline->getRect().mLeft;
+ // edit my objects permission icon width + padding
+ S32 permission_edit_mine_width = avatar_item->mIconPermissionMap->getRect().mLeft - avatar_item->mIconPermissionEditMine->getRect().mLeft;
+
+ // edit their objects permission icon width + padding
+ S32 permission_edit_theirs_width = avatar_item->mIconPermissionEditMine->getRect().mLeft - avatar_item->mIconPermissionEditTheirs->getRect().mLeft;
// last interaction time textbox width + padding
- S32 last_interaction_time_width = avatar_item->mIconPermissionOnline->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
+ S32 last_interaction_time_width = avatar_item->mIconPermissionEditTheirs->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
// avatar icon width + padding
S32 icon_width = avatar_item->mAvatarName->getRect().mLeft - avatar_item->mAvatarIcon->getRect().mLeft;
@@ -474,10 +474,10 @@ void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
sChildrenWidths[--index] = icon_width;
sChildrenWidths[--index] = 0; // for avatar name we don't need its width, it will be calculated as "left available space"
sChildrenWidths[--index] = last_interaction_time_width;
- sChildrenWidths[--index] = permission_online_width;
- sChildrenWidths[--index] = permission_map_width;
- sChildrenWidths[--index] = permission_edit_mine_width;
sChildrenWidths[--index] = permission_edit_theirs_width;
+ sChildrenWidths[--index] = permission_edit_mine_width;
+ sChildrenWidths[--index] = permission_map_width;
+ sChildrenWidths[--index] = permission_online_width;
sChildrenWidths[--index] = info_btn_width;
sChildrenWidths[--index] = profile_btn_width;
sChildrenWidths[--index] = speaking_indicator_width;
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index ffb988b2ab..52187284eb 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -143,10 +143,10 @@ private:
ALIC_SPEAKER_INDICATOR,
ALIC_PROFILE_BUTTON,
ALIC_INFO_BUTTON,
- ALIC_PERMISSION_EDIT_THEIRS,
- ALIC_PERMISSION_EDIT_MINE,
- ALIC_PERMISSION_MAP,
ALIC_PERMISSION_ONLINE,
+ ALIC_PERMISSION_MAP,
+ ALIC_PERMISSION_EDIT_MINE,
+ ALIC_PERMISSION_EDIT_THEIRS,
ALIC_INTERACTION_TIME,
ALIC_NAME,
ALIC_ICON,
diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/edit_mine.png
new file mode 100644
index 0000000000..a0bc7efd25
Binary files /dev/null and b/indra/newview/skins/default/textures/edit_mine.png differ
diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/edit_theirs.png
new file mode 100644
index 0000000000..ed36ad7cfc
Binary files /dev/null and b/indra/newview/skins/default/textures/edit_theirs.png differ
diff --git a/indra/newview/skins/default/textures/ff_edit_mine.tga b/indra/newview/skins/default/textures/ff_edit_mine.tga
deleted file mode 100644
index 8f0c35b98f..0000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_mine.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_edit_mine_button.tga b/indra/newview/skins/default/textures/ff_edit_mine_button.tga
deleted file mode 100644
index 07627a65c5..0000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_mine_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_edit_theirs.tga b/indra/newview/skins/default/textures/ff_edit_theirs.tga
deleted file mode 100644
index 005ada2dea..0000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_theirs.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_edit_theirs_button.tga b/indra/newview/skins/default/textures/ff_edit_theirs_button.tga
deleted file mode 100644
index 798ef641d3..0000000000
Binary files a/indra/newview/skins/default/textures/ff_edit_theirs_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_online_status_button.tga b/indra/newview/skins/default/textures/ff_online_status_button.tga
deleted file mode 100644
index 9076df6b9e..0000000000
Binary files a/indra/newview/skins/default/textures/ff_online_status_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_map.tga b/indra/newview/skins/default/textures/ff_visible_map.tga
deleted file mode 100644
index a4dad78dad..0000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_map.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_map_button.tga b/indra/newview/skins/default/textures/ff_visible_map_button.tga
deleted file mode 100644
index 8d13adee3f..0000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_map_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_online.tga b/indra/newview/skins/default/textures/ff_visible_online.tga
deleted file mode 100644
index 74e3a4e318..0000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_online.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/ff_visible_online_button.tga b/indra/newview/skins/default/textures/ff_visible_online_button.tga
deleted file mode 100644
index 08a6cbedd9..0000000000
Binary files a/indra/newview/skins/default/textures/ff_visible_online_button.tga and /dev/null differ
diff --git a/indra/newview/skins/default/textures/see_me_online.png b/indra/newview/skins/default/textures/see_me_online.png
new file mode 100644
index 0000000000..52dc2ae74f
Binary files /dev/null and b/indra/newview/skins/default/textures/see_me_online.png differ
diff --git a/indra/newview/skins/default/textures/see_on_map.png b/indra/newview/skins/default/textures/see_on_map.png
new file mode 100644
index 0000000000..200e649818
Binary files /dev/null and b/indra/newview/skins/default/textures/see_on_map.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 273531f9b2..2776c07202 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -360,10 +360,10 @@ with the same filename but different name
<texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
<texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
- <texture name="Permission_Visible_Online" file_name="ff_visible_online_button.tga" preload="false" />
- <texture name="Permission_Visible_Map" file_name="ff_visible_map_button.tga" preload="false" />
- <texture name="Permission_Edit_Objects_Mine" file_name="ff_edit_mine_button.tga" preload="false" />
- <texture name="Permission_Edit_Objects_Theirs" file_name="ff_edit_theirs_button.tga" preload="false" />
+ <texture name="Permission_Visible_Online" file_name="see_me_online.png" preload="false" />
+ <texture name="Permission_Visible_Map" file_name="see_on_map.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Mine" file_name="edit_mine.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Theirs" file_name="edit_theirs.png" preload="false" />
<texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" />
<texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index b385654010..6f3629cc8f 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -19,6 +19,11 @@
<string name="FormatMonths">[COUNT]mon</string>
<string name="FormatYears">[COUNT]y</string>
+ <!--
+ *NOTE: llavatarlistitem.cpp lays these controls out depending on which
+ ones are visible. Trying to change their order here will break it
+ ... which kinda sucks.
+ -->
<icon
follows="top|right|left"
height="24"
@@ -71,49 +76,49 @@
value="0s"
width="35" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Visible_Online"
+ image_name="Permission_Edit_Objects_Theirs"
layout="topleft"
left_pad="3"
- right="-141"
- name="permission_online_icon"
- tool_tip="This friend can see when you're online"
- top="2"
- width="20" />
+ right="-129"
+ name="permission_edit_theirs_icon"
+ tool_tip="You can edit this friend's objects"
+ top="4"
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Visible_Map"
+ image_name="Permission_Edit_Objects_Mine"
layout="topleft"
left_pad="3"
- tool_tip="This friend can locate you on the map"
- right="-118"
- name="permission_map_icon"
+ right="-110"
+ name="permission_edit_mine_icon"
+ tool_tip="This friend can edit, delete or take your objects"
top_delta="0"
- width="20" />
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Edit_Objects_Mine"
+ image_name="Permission_Visible_Map"
layout="topleft"
left_pad="3"
- right="-95"
- name="permission_edit_mine_icon"
- tool_tip="This friend can edit, delete or take your objects"
+ tool_tip="This friend can locate you on the map"
+ right="-91"
+ name="permission_map_icon"
top_delta="0"
- width="20" />
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Edit_Objects_Theirs"
+ image_name="Permission_Visible_Online"
layout="topleft"
left_pad="3"
right="-72"
- name="permission_edit_theirs_icon"
- tool_tip="You can edit this friend's objects"
+ name="permission_online_icon"
+ tool_tip="This friend can see when you're online"
top_delta="0"
- width="20" />
+ width="16" />
<button
follows="right"
height="16"
@@ -124,7 +129,7 @@
right="-53"
name="info_btn"
tab_stop="false"
- top_delta="2"
+ top_delta="0"
width="16" />
<button
follows="right"
--
cgit v1.2.3
From 93eb6cac2d89b1f9b3aabb982d6396759fd58bb7 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 23 Sep 2010 13:17:58 +0100
Subject: STORM-128 SUPPLEMENTARY Move new permissions icons into the icons
directory. (transplanted from f71072a1532b3fa3de98197dd0ceeb3071ac6856)
---
indra/newview/skins/default/textures/edit_mine.png | Bin 639 -> 0 bytes
indra/newview/skins/default/textures/edit_theirs.png | Bin 634 -> 0 bytes
indra/newview/skins/default/textures/icons/edit_mine.png | Bin 0 -> 639 bytes
.../newview/skins/default/textures/icons/edit_theirs.png | Bin 0 -> 634 bytes
.../skins/default/textures/icons/see_me_online.png | Bin 0 -> 330 bytes
indra/newview/skins/default/textures/icons/see_on_map.png | Bin 0 -> 613 bytes
indra/newview/skins/default/textures/see_me_online.png | Bin 330 -> 0 bytes
indra/newview/skins/default/textures/see_on_map.png | Bin 613 -> 0 bytes
indra/newview/skins/default/textures/textures.xml | 8 ++++----
9 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 indra/newview/skins/default/textures/edit_mine.png
delete mode 100644 indra/newview/skins/default/textures/edit_theirs.png
create mode 100644 indra/newview/skins/default/textures/icons/edit_mine.png
create mode 100644 indra/newview/skins/default/textures/icons/edit_theirs.png
create mode 100644 indra/newview/skins/default/textures/icons/see_me_online.png
create mode 100644 indra/newview/skins/default/textures/icons/see_on_map.png
delete mode 100644 indra/newview/skins/default/textures/see_me_online.png
delete mode 100644 indra/newview/skins/default/textures/see_on_map.png
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/edit_mine.png
deleted file mode 100644
index a0bc7efd25..0000000000
Binary files a/indra/newview/skins/default/textures/edit_mine.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/edit_theirs.png
deleted file mode 100644
index ed36ad7cfc..0000000000
Binary files a/indra/newview/skins/default/textures/edit_theirs.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png
new file mode 100644
index 0000000000..a0bc7efd25
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/edit_mine.png differ
diff --git a/indra/newview/skins/default/textures/icons/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png
new file mode 100644
index 0000000000..ed36ad7cfc
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/edit_theirs.png differ
diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
new file mode 100644
index 0000000000..52dc2ae74f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/see_me_online.png differ
diff --git a/indra/newview/skins/default/textures/icons/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png
new file mode 100644
index 0000000000..200e649818
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/see_on_map.png differ
diff --git a/indra/newview/skins/default/textures/see_me_online.png b/indra/newview/skins/default/textures/see_me_online.png
deleted file mode 100644
index 52dc2ae74f..0000000000
Binary files a/indra/newview/skins/default/textures/see_me_online.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/see_on_map.png b/indra/newview/skins/default/textures/see_on_map.png
deleted file mode 100644
index 200e649818..0000000000
Binary files a/indra/newview/skins/default/textures/see_on_map.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2776c07202..fff118d69a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -360,10 +360,10 @@ with the same filename but different name
<texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
<texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
- <texture name="Permission_Visible_Online" file_name="see_me_online.png" preload="false" />
- <texture name="Permission_Visible_Map" file_name="see_on_map.png" preload="false" />
- <texture name="Permission_Edit_Objects_Mine" file_name="edit_mine.png" preload="false" />
- <texture name="Permission_Edit_Objects_Theirs" file_name="edit_theirs.png" preload="false" />
+ <texture name="Permission_Visible_Online" file_name="icons/see_me_online.png" preload="false" />
+ <texture name="Permission_Visible_Map" file_name="icons/see_on_map.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Mine" file_name="icons/edit_mine.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Theirs" file_name="icons/edit_theirs.png" preload="false" />
<texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" />
<texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
--
cgit v1.2.3
From d9547f5e8074f5997320815e8352c981022cb622 Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Tue, 28 Sep 2010 13:20:13 -0400
Subject: STORM-265 -- remove invisible button on menu bar that was tied to the
lag meter.
---
indra/newview/llstatusbar.cpp | 8 --------
indra/newview/llstatusbar.h | 1 -
indra/newview/skins/default/xui/en/panel_status_bar.xml | 9 ---------
3 files changed, 18 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 2c15ff9aed..0cf2b74f9c 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -213,8 +213,6 @@ BOOL LLStatusBar::postBuild()
mSGPacketLoss->mPerSec = FALSE;
addChild(mSGPacketLoss);
- getChild<LLTextBox>("stat_btn")->setClickedCallback(onClickStatGraph);
-
mPanelVolumePulldown = new LLPanelVolumePulldown();
addChild(mPanelVolumePulldown);
mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
@@ -506,12 +504,6 @@ void LLStatusBar::onClickMediaToggle(void* data)
LLViewerMedia::setAllMediaEnabled(enable);
}
-// static
-void LLStatusBar::onClickStatGraph(void* data)
-{
- LLFloaterReg::showInstance("lagmeter");
-}
-
BOOL can_afford_transaction(S32 cost)
{
return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 8840db2c4a..2388aeb0c8 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -92,7 +92,6 @@ private:
void onMouseEnterVolume();
void onMouseEnterNearbyMedia();
void onClickScreen(S32 x, S32 y);
- static void onClickStatGraph(void* data);
static void onClickMediaToggle(void* data);
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 4ccd7b3629..2f52ca660b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -118,13 +118,4 @@
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
- <text
- follows="right|top"
- halign="center"
- height="12"
- layout="topleft"
- left_delta="0"
- name="stat_btn"
- top_delta="0"
- width="20"/>
</panel>
--
cgit v1.2.3