From 465fd7c25f59692ffde989207868b212827dcdc4 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Mon, 7 Nov 2011 14:22:29 +0200 Subject: EXP-1539 FIXED (Viewer crash when clicking twice on slapp link secondlife:///app/classified/create) - Simple NULL checking to avoid crash --- indra/newview/llpanelpicks.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelpicks.cpp') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 04e78e04e3..b1d786d28d 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -134,7 +134,10 @@ public: LLFloater* picks_floater = LLFloaterReg::showInstance("picks"); LLPanelPicks* picks = picks_floater->findChild("panel_picks"); - picks->createNewPick(); + if (picks) + { + picks->createNewPick(); + } } void editPick(LLPickData* pick_info) @@ -251,7 +254,10 @@ public: LLFloater* picks_floater = LLFloaterReg::showInstance("picks"); LLPanelPicks* picks = picks_floater->findChild("panel_picks"); - picks->createNewClassified(); + if (picks) + { + picks->createNewClassified(); + } } void openClassified(LLAvatarClassifiedInfo* c_info) -- cgit v1.2.3 From 58138aa37b191cc9ed51d319f449a781761e5d28 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Wed, 9 Nov 2011 14:28:41 +0200 Subject: EXP-1537 FIXED (Selecting More Info from Classified section in Search floater launches People panel with inactive Edit button and access to OLD profile window) - Opening Floater Picks instead of old profile panel --- indra/newview/llpanelpicks.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelpicks.cpp') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 04e78e04e3..7dbda6c8de 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -269,7 +269,7 @@ public: params["classified_name"] = c_info->name; params["classified_desc"] = c_info->description; params["from_search"] = true; - LLFloaterSidePanelContainer::showPanel("people", "panel_profile_view", params); + LLFloaterSidePanelContainer::showPanel("picks", params); } else if (mRequestVerb == "edit") { -- cgit v1.2.3