diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-15 20:23:18 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-15 20:23:18 +0300 |
| commit | 67a326116bcb3cbb1b1394632468288295273aa5 (patch) | |
| tree | afe803cf25084640bddcd09c70f1bee4552ebbe1 /indra/newview/llagent.h | |
| parent | 14bf268fbb7464f9822847f922de321f422cf82a (diff) | |
| parent | 107af833abc9dbfbfda63ec67201d48a3d114ffb (diff) | |
Merge branch 'SL-14081' into DRTVWR-513-maint
# Conflicts:
# indra/newview/llviewerregion.cpp
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 78303ee560..64c26aac28 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -621,6 +621,10 @@ public: TELEPORT_PENDING = 7 }; + static std::map<S32, std::string> sTeleportStateName; + static const std::string& teleportStateName(S32); + const std::string& getTeleportStateName() const; + public: static void parseTeleportMessages(const std::string& xml_filename); const void getTeleportSourceSLURL(LLSLURL& slurl) const; |