summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-24 06:56:57 -0500
committerOz Linden <oz@lindenlab.com>2011-11-24 06:56:57 -0500
commitb69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (patch)
tree355347be68e29f59ad5299abd9b42423359eb60e /indra/llplugin
parentfb605a047aa1c6b293b9546a06ac800c53d109ba (diff)
parent8c86a08e72708e96dcf67830518187a00478bbfd (diff)
merge changes for vmrg-193
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginclassmedia.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index d95fa40091..47d7593479 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -270,7 +270,7 @@ public:
std::string getHoverText() const { return mHoverText; };
std::string getHoverLink() const { return mHoverLink; };
- std::string getMediaName() const { return mMediaName; };
+ const std::string& getMediaName() const { return mMediaName; };
std::string getMediaDescription() const { return mMediaDescription; };
// Crash the plugin. If you use this outside of a testbed, you will be punished.