Commits

leslie_linden committed f92111b Merge

Merge from PE. Thanks Paul

  • Participants
  • Parent commits 506dae3, bac7662

Comments (0)

Files changed (1)

File indra/newview/llpanelpicks.cpp

 		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)
 		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)