diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-09 11:15:41 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-09 11:15:41 -0800 |
| commit | 3ecba909a30bf3a0cb9ac51878638ae6520f0177 (patch) | |
| tree | 3984987d12713b5f2f2b1e09eb07bbf80aef1065 /indra/newview/llpanelpicks.cpp | |
| parent | 0b323da48a9b9ff46a596f47c56274dc1f7e17d0 (diff) | |
| parent | 465fd7c25f59692ffde989207868b212827dcdc4 (diff) | |
Merge from PE. Thanks Paul
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rwxr-xr-x | indra/newview/llpanelpicks.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 7dbda6c8de..b6c9f825df 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) |