Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 575ad5363d..e02be6c8c1 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -668,6 +668,12 @@ void LLImageRaw::fill( const LLColor4U& color )
 // Src and dst can be any size.  Src and dst can each have 3 or 4 components.
 void LLImageRaw::copy(LLImageRaw* src)
 {
+	if (!src)
+	{
+		llwarns << "LLImageRaw::copy called with a null src pointer" << llendl;
+		return;
+	}
+
 	LLImageRaw* dst = this;  // Just for clarity.
 
 	llassert( (3 == src->getComponents()) || (4 == src->getComponents()) );