summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llsyntaxid.h57
1 files changed, 31 insertions, 26 deletions
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index b968dd233d..824454f9a1 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -37,32 +37,6 @@
#include "llhttpclient.h"
#include "llviewerregion.h"
-/**
- * @file llsyntaxid.h
- * @brief Handles responses for the LSLSyntax capability's get call.
- */
-class fetchKeywordsFileResponder : public LLHTTPClient::Responder
-{
-public:
- std::string mFileSpec;
-
- /**
- * @brief fetchKeywordsFileResponder
- * @param filespec File path and name of where to save the returned data
- */
- fetchKeywordsFileResponder(std::string filespec);
-
- void errorWithContent(U32 status,
- const std::string& reason,
- const LLSD& content);
-
- /**
- * @brief Saves the returned file to the location provided at instantiation.
- * @param content_ref The LSL syntax file for the sim.
- */
- void result(const LLSD& content_ref);
-};
-
/**
* @file llsyntaxid.h
@@ -70,6 +44,7 @@ public:
*/
class LLSyntaxIdLSL
{
+friend class fetchKeywordsFileResponder;
public:
@@ -90,6 +65,7 @@ private:
LLUUID mSyntaxIdNew;
static LLSD sKeywordsXml;
+ static bool sLoaded;
public:
@@ -103,7 +79,9 @@ public:
LLUUID getSyntaxId() const { return mSyntaxIdCurrent; }
void initialise();
+ bool isLoaded() { return sLoaded; }
+ static bool isSupportedVersion(const LLSD& content);
static void setKeywordsXml(const LLSD& content) { sKeywordsXml = content; }
@@ -119,3 +97,30 @@ protected:
void setFileNameNew(std::string name) { mFileNameNew = name; }
void setSimulatorFeatureName(const std::string& name) { mSimulatorFeature = name; }
};
+
+
+/**
+ * @file llsyntaxid.h
+ * @brief Handles responses for the LSLSyntax capability's get call. Is a friend of LLSyntaxIdLSL
+ */
+class fetchKeywordsFileResponder : public LLHTTPClient::Responder
+{
+public:
+ std::string mFileSpec;
+
+ /**
+ * @brief fetchKeywordsFileResponder
+ * @param filespec File path and name of where to save the returned data
+ */
+ fetchKeywordsFileResponder(std::string filespec);
+
+ void errorWithContent(U32 status,
+ const std::string& reason,
+ const LLSD& content);
+
+ /**
+ * @brief Saves the returned file to the location provided at instantiation.
+ * @param content_ref The LSL syntax file for the sim.
+ */
+ void result(const LLSD& content_ref);
+};