aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorRevolutionSmythe2010-10-20 16:31:09 -0500
committerMcCabe Maxsted2010-11-01 16:58:02 -0700
commitaf6877fbfe94e80948c559cf77f008049f8168dc (patch)
tree4fe687aaec6a1b964a0e989d3c03c143b4ab07f6 /linden/indra/newview/llagent.cpp
parentMerge remote branch 'thickbrick/weekly' into weekly (diff)
downloadmeta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.zip
meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.gz
meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.bz2
meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.xz
Finishes the OpenRegionSettings module, adds a new panel to Region/Estate for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r--linden/indra/newview/llagent.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 758cae2..de1fc84 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -36,7 +36,6 @@
36#include "stdenums.h" 36#include "stdenums.h"
37 37
38#include "llagent.h" 38#include "llagent.h"
39
40#include "llcamera.h" 39#include "llcamera.h"
41#include "llcoordframe.h" 40#include "llcoordframe.h"
42#include "indra_constants.h" 41#include "indra_constants.h"
@@ -441,6 +440,7 @@ LLAgent::LLAgent() :
441void LLAgent::init() 440void LLAgent::init()
442{ 441{
443 mDrawDistance = gSavedSettings.getF32("RenderFarClip"); 442 mDrawDistance = gSavedSettings.getF32("RenderFarClip");
443 mLockedDrawDistance = FALSE;
444 444
445 // *Note: this is where LLViewerCamera::getInstance() used to be constructed. 445 // *Note: this is where LLViewerCamera::getInstance() used to be constructed.
446 446
@@ -6026,6 +6026,14 @@ void LLAgent::setHomePosRegion( const U64& region_handle, const LLVector3& pos_r
6026 mHomePosRegion = pos_region; 6026 mHomePosRegion = pos_region;
6027} 6027}
6028 6028
6029void LLAgent::takeHomeScreenshot()
6030{
6031 std::string snap_filename = gDirUtilp->getLindenUserDir();
6032 snap_filename += gDirUtilp->getDirDelimiter();
6033 snap_filename += SCREEN_HOME_FILENAME;
6034 gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
6035}
6036
6029BOOL LLAgent::getHomePosGlobal( LLVector3d* pos_global ) 6037BOOL LLAgent::getHomePosGlobal( LLVector3d* pos_global )
6030{ 6038{
6031 if(!mHaveHomePosition) 6039 if(!mHaveHomePosition)