From 13c391f1984bb8cb9d67a7729af2ee5714409215 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 14 Sep 2007 21:13:20 +0000
Subject: EFFECTIVE MERGE: svn merge -r 68118:68999
 svn+ssh://svn/svn/linden/branches/maintenance

ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
---
 indra/newview/llviewerpartsource.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewerpartsource.cpp')

diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
index 414d94e8ad..4d640e5e59 100644
--- a/indra/newview/llviewerpartsource.cpp
+++ b/indra/newview/llviewerpartsource.cpp
@@ -47,7 +47,15 @@ void LLViewerPartSource::update(const F32 dt)
 	llerrs << "Creating default part source!" << llendl;
 }
 
-
+LLUUID LLViewerPartSource::getImageUUID() const
+{
+	LLViewerImage* imagep = mImagep;
+	if(imagep)
+	{
+		return imagep->getID();
+	}
+	return LLUUID::null;
+}
 
 LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) :
 	LLViewerPartSource(LL_PART_SOURCE_SCRIPT)
-- 
cgit v1.2.3