From 8cf7dad209fd97c1ab822ef183e8a74faceeb3d8 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Tue, 23 Feb 2010 17:36:25 -0800 Subject: =?UTF-8?q?FIX=20EXT-5680:=20Get=20rid=20of=20unnecessary=20code?= =?UTF-8?q?=20that=20formats=20the=20media=20item=20count=20Review=20#139?= =?UTF-8?q?=20The=20crash=20was=20happening=20because=20the=20German=20(lo?= =?UTF-8?q?cale=20"de")=20version=20of=20the=20format=20string=20had=20an?= =?UTF-8?q?=20=E2=80=8B%ls=20in=20it,=20which=20was=20causing=20the=20cras?= =?UTF-8?q?h.=20Getting=20rid=20of=20the=20widget=20and=20the=20string=20s?= =?UTF-8?q?ince=20it=20is=20no=20longer=20desired=20in=20the=20design.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/llpanelnearbymedia.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanelnearbymedia.h') diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h index 6fe724266b..551e2419c4 100644 --- a/indra/newview/llpanelnearbymedia.h +++ b/indra/newview/llpanelnearbymedia.h @@ -149,7 +149,6 @@ private: void onClickSelectedMediaUnzoom(); LLUICtrl* mNearbyMediaPanel; - LLTextBox* mItemCountText; LLScrollListCtrl* mMediaList; LLUICtrl* mEnableAllCtrl; LLUICtrl* mDisableAllCtrl; -- cgit v1.2.3 From 262f34b25dbdde7940ef28ff02058f4ef12d92f1 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Tue, 23 Feb 2010 18:13:50 -0800 Subject: FIX EXT-5517: clear hover face when cursor hovers over Nearby Media panel Review #140 This isn't the most generalized solution, but it fixes the proximal problem of selecting items in the Nearby Media panel, and is low risk because the code change is isolated to that panel. --- indra/newview/llpanelnearbymedia.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanelnearbymedia.h') diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h index 551e2419c4..4f864519f5 100644 --- a/indra/newview/llpanelnearbymedia.h +++ b/indra/newview/llpanelnearbymedia.h @@ -56,6 +56,7 @@ public: /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); /*virtual*/ void onTopLost (); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); // this is part of the nearby media *dialog* so we can track whether // the user *implicitly* wants audio on or off via their *explicit* -- cgit v1.2.3