aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:07 -0500
committerJacek Antonelli2008-08-15 23:45:07 -0500
commit8465910c79b8e746e04fd581cca2d60399e569b9 (patch)
treef43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llagent.h
parentSecond Life viewer sources 1.18.2.1 (diff)
downloadmeta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llagent.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 7fb4571..9c53fe1 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -529,8 +529,7 @@ public:
529 TELEPORT_REQUESTED = 2, // Waiting for source simulator to respond 529 TELEPORT_REQUESTED = 2, // Waiting for source simulator to respond
530 TELEPORT_MOVING = 3, // Viewer has received destination location from source simulator 530 TELEPORT_MOVING = 3, // Viewer has received destination location from source simulator
531 TELEPORT_START_ARRIVAL = 4, // Transition to ARRIVING. Viewer has received avatar update, etc., from destination simulator 531 TELEPORT_START_ARRIVAL = 4, // Transition to ARRIVING. Viewer has received avatar update, etc., from destination simulator
532 TELEPORT_ARRIVING = 5, // Make the user wait while content "pre-caches" 532 TELEPORT_ARRIVING = 5 // Make the user wait while content "pre-caches"
533 TELEPORT_CANCELLING = 6 // used only if user clicks "cancel" button
534 }; 533 };
535 534
536 ETeleportState getTeleportState() const { return mTeleportState; } 535 ETeleportState getTeleportState() const { return mTeleportState; }