1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 5e2d91d31e..33fd9f2dd9 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1828,7 +1828,7 @@ void LLToolDragAndDrop::dropScript(LLViewerObject* hit_obj,
                 }
             }
         }
-        hit_obj->saveScript(new_script, active, true);
+        hit_obj->saveScript(new_script, active, true, LLUUID::null);
         if (gFloaterTools)
         {
             gFloaterTools->dirty();
@@ -2578,7 +2578,12 @@ bool is_water_exclusion_face(LLViewerObject* obj, S32 face)
     bool exclude_water = (image->getID() == IMG_ALPHA_GRAD) && obj->isImageAlphaBlended(face);
 
     // transparency
-    exclude_water &= (obj->getTE(face)->getColor().mV[VALPHA] == 1);
+    // getTE gets from a different source than getTEImage, so check for null
+    LLTextureEntry* te = obj->getTE(face);
+    if (te)
+    {
+        exclude_water &= (te->getColor().mV[VALPHA] == 1);
+    }
 
     //absence of normal and specular textures
     image = obj->getTENormalMap(face);