diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:59:20 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 11:59:20 -0700 |
| commit | bb585d95b5955effb813621942e10429ea97df1f (patch) | |
| tree | 7e1364e8313052b53c5e2b4e19733d6b59b33867 /indra/newview/llfloaterpreference.h | |
| parent | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (diff) | |
Fix merge by putting back loadFromFilename.
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 54f985193a..fd6ce0239f 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -199,6 +199,7 @@ private: void onDeleteTranscriptsResponse(const LLSD& notification, const LLSD& response); void updateDeleteTranscriptsButton(); void updateMaxComplexity(); + static bool loadFromFilename(const std::string& filename, std::map<std::string, std::string> &label_map); static std::string sSkin; notifications_map mNotificationOptions; |