Added the Windlight presets from Emerald.

Camera reset and target position offsets for teleporting are in.
Still having problems with the popup menu not displaying correctly on startup. Poke it a couple times and it's fine. I dunno.
This commit is contained in:
Beeks
2010-09-01 05:41:54 -04:00
parent 3efd8d87a1
commit 7f8652ca20
658 changed files with 75236 additions and 3 deletions

View File

@@ -6310,6 +6310,10 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
LLViewerRegion* regionp = getRegion();
U64 handle = to_region_handle(pos_global);
LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle);
bool calc = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
LLVector3 offset = LLVector3(0.f,0.f,0.f);
if(calc)
offset += LLVector3(0.f,0.f,gAgent.getAvatarObject()->getScale().mV[2] / 2.0);
if(regionp && info)
{
LLVector3d region_origin = info->getGlobalOrigin();
@@ -6317,6 +6321,7 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
(F32)(pos_global.mdV[VX] - region_origin.mdV[VX]),
(F32)(pos_global.mdV[VY] - region_origin.mdV[VY]),
(F32)(pos_global.mdV[VZ]));
pos_local += offset;
teleportRequest(handle, pos_local);
}
else if(regionp &&