summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lltextureentry.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-21 18:49:19 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-21 18:49:19 -0700
commit642d368eccd662494a4958a50ba2bd3301b5207e (patch)
tree0aaa9d2981260051009e765a6171ad328f031183 /indra/llprimitive/lltextureentry.h
parentc7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff)
parente25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (diff)
merge
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
-rw-r--r--indra/llprimitive/lltextureentry.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 8d2834f78c..d6366b9bb2 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -171,7 +171,9 @@ public:
static U32 getVersionFromMediaVersionString(const std::string &version_string);
// Given a media version string, return the UUID of the agent
static LLUUID getAgentIDFromMediaVersionString(const std::string &version_string);
-
+ // Return whether or not the given string is actually a media version
+ static bool isMediaVersionString(const std::string &version_string);
+
// Media flags
enum { MF_NONE = 0x0, MF_HAS_MEDIA = 0x1 };