diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerpartsource.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp index 836748a..a69fc51 100644 --- a/linden/indra/newview/llviewerpartsource.cpp +++ b/linden/indra/newview/llviewerpartsource.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llviewerpartsource.cpp | 2 | * @file llviewerpartsource.cpp |
3 | * @brief LLViewerPartSource class implementation | 3 | * @brief LLViewerPartSource class implementation |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2003-2007, Linden Research, Inc. | 7 | * Copyright (c) 2003-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #include "llviewerprecompiledheaders.h" | 32 | #include "llviewerprecompiledheaders.h" |
@@ -67,7 +70,15 @@ void LLViewerPartSource::update(const F32 dt) | |||
67 | llerrs << "Creating default part source!" << llendl; | 70 | llerrs << "Creating default part source!" << llendl; |
68 | } | 71 | } |
69 | 72 | ||
70 | 73 | LLUUID LLViewerPartSource::getImageUUID() const | |
74 | { | ||
75 | LLViewerImage* imagep = mImagep; | ||
76 | if(imagep) | ||
77 | { | ||
78 | return imagep->getID(); | ||
79 | } | ||
80 | return LLUUID::null; | ||
81 | } | ||
71 | 82 | ||
72 | LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) : | 83 | LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) : |
73 | LLViewerPartSource(LL_PART_SOURCE_SCRIPT) | 84 | LLViewerPartSource(LL_PART_SOURCE_SCRIPT) |