diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-24 09:50:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-24 09:50:32 -0400 |
| commit | 94c5f1475efcee3f1f1407736c53eddf5f9d3ae2 (patch) | |
| tree | 396b6a54a5811db86ff68b21435f3761ec0a4e0c /indra/newview/lllogininstance.h | |
| parent | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (diff) | |
| parent | 6980f5bcc247bc12fd0672164cc713db2e93198a (diff) | |
merge changes for MAINT-7594
Diffstat (limited to 'indra/newview/lllogininstance.h')
| -rw-r--r-- | indra/newview/lllogininstance.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h index 282ddc1cea..1adea67189 100644 --- a/indra/newview/lllogininstance.h +++ b/indra/newview/lllogininstance.h @@ -67,7 +67,7 @@ public: void setSerialNumber(const std::string& sn) { mSerialNumber = sn; } void setLastExecEvent(int lee) { mLastExecEvent = lee; } void setLastExecDuration(S32 duration) { mLastExecDuration = duration; } - void setPlatformInfo(const std::string platform, const std::string platform_version); + void setPlatformInfo(const std::string platform, const std::string platform_version, const std::string platform_name); void setNotificationsInterface(LLNotificationsInterface* ni) { mNotifications = ni; } LLNotificationsInterface& getNotificationsInterface() const { return *mNotifications; } @@ -105,6 +105,7 @@ private: S32 mLastExecDuration; std::string mPlatform; std::string mPlatformVersion; + std::string mPlatformVersionName; UpdaterLauncherCallback mUpdaterLauncher; LLEventDispatcher mDispatcher; LLUpdaterService * mUpdaterService; |
