Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of https://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
TighMacFanatic
2011-10-05 20:17:24 -04:00
parent a1628abec3 5ef79d571b
commit ed8fad3fd9
152 changed files with 4311 additions and 3249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewermessage.cpp
View File

@@ -1845,7 +1845,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
//Generate slurl
std::string slrul = gAgent.getSLURL();
//Generate idle time
LLVOAvatar* myavatar = gAgent.getAvatarObject();
LLVOAvatar* myavatar = gAgentAvatarp;
std::string idle_time = "";
if(myavatar)idle_time = llformat("%d mins", (U8)(myavatar->mIdleTimer.getElapsedTimeF32()/60.));
@@ -3748,9 +3748,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
gAgent.setRegion(regionp);
gObjectList.shiftObjects(shift_vector);
if (gAgent.getAvatarObject())
if (gAgentAvatarp)
{
gAgent.getAvatarObject()->clearChatText();
gAgentAvatarp->clearChatText();
gAgentCamera.slamLookAt(look_at);
}
gAgent.setPositionAgent(pos);
@@ -3844,7 +3844,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
std::string version_channel;
msg->getString("SimData", "ChannelVersion", version_channel);
LLVOAvatar* avatarp = gAgent.getAvatarObject();
LLVOAvatar* avatarp = gAgentAvatarp;
if (!avatarp)
{
// Could happen if you were immediately god-teleported away on login,
@@ -4956,7 +4956,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
BOOL force_mouselook;
mesgsys->getBOOLFast(_PREHASH_SitTransform, _PREHASH_ForceMouselook, force_mouselook);
LLVOAvatar* avatar = gAgent.getAvatarObject();
LLVOAvatar* avatar = gAgentAvatarp;
if (avatar && dist_vec_squared(camera_eye, camera_at) > 0.0001f)
{