summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-05-29 18:02:38 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-05-29 18:02:38 -0700
commitfbf01e9c2a919fb51df2c6d71fa9d673ca69c1a8 (patch)
treec1b9f706ce0064b0131b0570a33fb6062d5c9bd1 /indra/newview/llagent.h
parent8ff00d6ecfb733876126fb5a2ebae6fe20e38f6f (diff)
EXP-1942,EXP-1945: Pulling down the teleport screen in the scenario of waiting for a maturity preference change that is still being posted to the server.
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r--indra/newview/llagent.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 51c3c18c2e..a505d5bbae 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -544,7 +544,8 @@ public:
TELEPORT_MOVING = 3, // Viewer has received destination location from source simulator
TELEPORT_START_ARRIVAL = 4, // Transition to ARRIVING. Viewer has received avatar update, etc., from destination simulator
TELEPORT_ARRIVING = 5, // Make the user wait while content "pre-caches"
- TELEPORT_LOCAL = 6 // Teleporting in-sim without showing the progress screen
+ TELEPORT_LOCAL = 6, // Teleporting in-sim without showing the progress screen
+ TELEPORT_PENDING = 7
};
public: