diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-12 11:44:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-12 11:44:16 +0100 |
| commit | df07ba176cc8df1709537d514d6f9756d749e786 (patch) | |
| tree | 91c436bb6370e511fc2679e8f7b7ca22b7114f70 /indra/newview/llagent.cpp | |
| parent | 6c086be01659a0d23a91bf6e3ea07bafd86c4dd7 (diff) | |
| parent | 1cee577ca0234eee7da243c85be8eb7524d691c7 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 88ba5dce11..529ce950e4 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3238,7 +3238,7 @@ bool LLAgent::teleportCore(bool is_local) // MBW -- Let the voice client know a teleport has begun so it can leave the existing channel. // This was breaking the case of teleporting within a single sim. Backing it out for now. -// gVoiceClient->leaveChannel(); +// LLVoiceClient::getInstance()->leaveChannel(); return true; } @@ -3382,7 +3382,7 @@ void LLAgent::setTeleportState(ETeleportState state) if (mTeleportState == TELEPORT_MOVING) { // We're outa here. Save "back" slurl. - mTeleportSourceSLURL = LLAgentUI::buildSLURL(); + LLAgentUI::buildSLURL(mTeleportSourceSLURL); } else if(mTeleportState == TELEPORT_ARRIVING) { @@ -3558,7 +3558,7 @@ void LLAgent::sendAgentSetAppearance() const ETextureIndex texture_index = LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)baked_index); // if we're not wearing a skirt, we don't need the texture to be baked - if (texture_index == TEX_SKIRT_BAKED && !gAgentAvatarp->isWearingWearableType(WT_SKIRT)) + if (texture_index == TEX_SKIRT_BAKED && !gAgentAvatarp->isWearingWearableType(LLWearableType::WT_SKIRT)) { continue; } @@ -3581,8 +3581,8 @@ void LLAgent::sendAgentSetAppearance() LLUUID hash; for (U8 i=0; i < baked_dict->mWearables.size(); i++) { - // EWearableType wearable_type = gBakedWearableMap[baked_index][wearable_num]; - const EWearableType wearable_type = baked_dict->mWearables[i]; + // LLWearableType::EType wearable_type = gBakedWearableMap[baked_index][wearable_num]; + const LLWearableType::EType wearable_type = baked_dict->mWearables[i]; // MULTI-WEARABLE: fixed to 0th - extend to everything once messaging works. const LLWearable* wearable = gAgentWearables.getWearable(wearable_type,0); if (wearable) |