summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-05-17 14:50:33 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-05-17 14:50:33 -0700
commitecdc5cf7647c0cbbb057dba2f4bdeaafc3f5a93f (patch)
treea723c7090aeea092f4b80f430caead67ba22be4b /indra/newview/llagent.cpp
parent9d8bf7f401230386a723055d54dd9dbb2be7a037 (diff)
EXP-1928: Handling the rare case that the user preferences cannot be successfully changed, and reporting that to the user.
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-xindra/newview/llagent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3b1e894ed3..5d5e585563 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -325,7 +325,7 @@ LLAgent::LLAgent() :
mTeleportFinishedSlot(),
mTeleportFailedSlot(),
mIsMaturityRatingChangingDuringTeleport(false),
- mMaturityRatingChange(0),
+ mMaturityRatingChange(0U),
mTeleportState( TELEPORT_NONE ),
mRegionp(NULL),
@@ -3618,7 +3618,7 @@ void LLAgent::clearFailedTeleportRequest()
}
}
-void LLAgent::setMaturityRatingChangeDuringTeleport(int pMaturityRatingChange)
+void LLAgent::setMaturityRatingChangeDuringTeleport(U8 pMaturityRatingChange)
{
mIsMaturityRatingChangingDuringTeleport = true;
mMaturityRatingChange = pMaturityRatingChange;