1 files changed, 25 insertions, 12 deletions

diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 9ff44f4..82b50ec 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -1996,12 +1996,18 @@ BOOL LLPanelLandOptions::postBuild()
 
         
         mSnapshotCtrl = LLUICtrlFactory::getTexturePickerByName(this, "snapshot_ctrl");
-        mSnapshotCtrl->setCommitCallback( onCommitAny );
-        mSnapshotCtrl->setCallbackUserData( this );
-        mSnapshotCtrl->setAllowNoTexture ( TRUE );
-        mSnapshotCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-        mSnapshotCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-
+        if (mSnapshotCtrl)
+        {
+                mSnapshotCtrl->setCommitCallback( onCommitAny );
+                mSnapshotCtrl->setCallbackUserData( this );
+                mSnapshotCtrl->setAllowNoTexture ( TRUE );
+                mSnapshotCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mSnapshotCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+        }
+        else
+        {
+                llwarns << "LLUICtrlFactory::getTexturePickerByName() returned NULL for 'snapshot_ctrl'" << llendl;
+        }
 
 
         mLocationText = LLUICtrlFactory::getTextBoxByName(this, "Landing Point: (none)");
@@ -2333,12 +2339,19 @@ BOOL LLPanelLandMedia::postBuild()
 
 
         mMediaTextureCtrl = LLUICtrlFactory::getTexturePickerByName(this, "media texture");
-        mMediaTextureCtrl->setCommitCallback( onCommitAny );
-        mMediaTextureCtrl->setCallbackUserData( this );
-        mMediaTextureCtrl->setAllowNoTexture ( TRUE );
-        mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-        mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-
+        if (mMediaTextureCtrl)
+        {
+                mMediaTextureCtrl->setCommitCallback( onCommitAny );
+                mMediaTextureCtrl->setCallbackUserData( this );
+                mMediaTextureCtrl->setAllowNoTexture ( TRUE );
+                mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+        }
+        else
+        {
+                llwarns << "LLUICtrlFactory::getTexturePickerByName() returned NULL for 'media texure'" << llendl;
+        }
+                
         mMediaAutoScaleCheck = LLUICtrlFactory::getCheckBoxByName(this, "media_auto_scale");
         childSetCommitCallback("media_auto_scale", onCommitAny, this);