From 36fccc3888c5dc318a8a235da8a5cae4faeb637d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 30 Apr 2008 23:30:09 +0000
Subject: svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r
 84579:85724 maint-ui-11-qa).

---
 indra/newview/llviewerpartsource.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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

diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp
index 7e9f3e2fa9..b6f16d1002 100644
--- a/indra/newview/llviewerpartsource.cpp
+++ b/indra/newview/llviewerpartsource.cpp
@@ -466,6 +466,25 @@ LLPointer<LLViewerPartSourceScript> LLViewerPartSourceScript::unpackPSS(LLViewer
 	}
 }
 
+
+/* static */
+LLPointer<LLViewerPartSourceScript> LLViewerPartSourceScript::createPSS(LLViewerObject *source_objp, const LLPartSysData& particle_parameters)
+{
+	LLMemType mt(LLMemType::MTYPE_PARTICLES);
+
+	LLPointer<LLViewerPartSourceScript> new_pssp = new LLViewerPartSourceScript(source_objp);
+
+	new_pssp->mPartSysData = particle_parameters;
+
+	if (new_pssp->mPartSysData.mTargetUUID.notNull())
+	{
+		LLViewerObject *target_objp = gObjectList.findObject(new_pssp->mPartSysData.mTargetUUID);
+		new_pssp->setTargetObject(target_objp);
+	}
+	return new_pssp;
+}
+
+
 void LLViewerPartSourceScript::setImage(LLViewerImage *imagep)
 {
 	LLMemType mt(LLMemType::MTYPE_PARTICLES);
-- 
cgit v1.2.3