summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-11-07 14:22:29 +0200
committerPaul ProductEngine <pguslisty@productengine.com>2011-11-07 14:22:29 +0200
commit465fd7c25f59692ffde989207868b212827dcdc4 (patch)
tree08676e3373b15231404f879ef834917d9c67dbc0
parentd6d4bfa02a46c5c7f2e5376b9fad79f2624dda83 (diff)
EXP-1539 FIXED (Viewer crash when clicking twice on slapp link secondlife:///app/classified/create)
- Simple NULL checking to avoid crash
-rwxr-xr-xindra/newview/llpanelpicks.cpp10
1 files changed, 8 insertions, 2 deletions
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<LLPanelPicks>("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<LLPanelPicks>("panel_picks");
- picks->createNewClassified();
+ if (picks)
+ {
+ picks->createNewClassified();
+ }
}
void openClassified(LLAvatarClassifiedInfo* c_info)