diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:37:07 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:37:07 +0100 |
| commit | 0bb3f144c0a6712a269246975635962b3b5f48d0 (patch) | |
| tree | ba6c371a3c40f878d20eccac7065ac11a4a51f1d /indra/newview/llagent.h | |
| parent | 9523c70f9dd3b2db21f6578bbb2b1da6873004ea (diff) | |
Backed out changeset 63b699f90efd
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 32f9b00135..a460077b7e 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -42,7 +42,6 @@ #include "llpointer.h" #include "lluicolor.h" #include "llvoavatardefines.h" -#include "llslurl.h" extern const BOOL ANIMATE; extern const U8 AGENT_STATE_TYPING; // Typing indication @@ -515,13 +514,13 @@ public: public: static void parseTeleportMessages(const std::string& xml_filename); - const void getTeleportSourceSLURL(LLSLURL& slurl) const { slurl = mTeleportSourceSLURL; } + const std::string getTeleportSourceSLURL() const { return mTeleportSourceSLURL; } public: // ! TODO ! Define ERROR and PROGRESS enums here instead of exposing the mappings. static std::map<std::string, std::string> sTeleportErrorMessages; static std::map<std::string, std::string> sTeleportProgressMessages; private: - LLSLURL mTeleportSourceSLURL; // SLURL where last TP began + std::string mTeleportSourceSLURL; // SLURL where last TP began //-------------------------------------------------------------------- // Teleport Actions |