diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:17:30 -0700 |
commit | 80b682d4b4dd1256ee09dd3327d2c51e3adee0b5 (patch) | |
tree | 751731e4b23e08264caf6436ae2c60cff8094240 /indra/llprimitive/lltextureentry.h | |
parent | b43771cad585cb9820941eb1b24b67390eaa9435 (diff) | |
parent | 127b428863707c882fbf4d30699321b8a2365644 (diff) |
merge
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
-rw-r--r-- | indra/llprimitive/lltextureentry.h | 4 |
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 }; |