diff options
| author | Richard Linden <none@none> | 2010-06-15 13:54:06 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-15 13:54:06 -0700 |
| commit | 2b7188d6149ed01d3c078eed6da58155490c9f49 (patch) | |
| tree | 8f1e99d6065a3daa56d603f01d612adf6df1266b /indra/newview/llagentcamera.h | |
| parent | f12aa928c557230664666ced9b55ef643bbfb7c2 (diff) | |
| parent | 8b95793c35c2fe1bf8ddf100fb4481b674ddfc63 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagentcamera.h')
| -rw-r--r-- | indra/newview/llagentcamera.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 5cbb1de6f4..7afb5c0ed9 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -39,6 +39,7 @@ class LLPickInfo; class LLVOAvatarSelf; +class LLControlVariable; //-------------------------------------------------------------------- // Types @@ -121,10 +122,10 @@ private: ECameraPreset mCameraPreset; /** Initial camera offsets */ - std::map<ECameraPreset, LLVector3> mCameraOffsetInitial; + std::map<ECameraPreset, LLPointer<LLControlVariable> > mCameraOffsetInitial; /** Initial focus offsets */ - std::map<ECameraPreset, LLVector3d> mFocusOffsetInitial; + std::map<ECameraPreset, LLPointer<LLControlVariable> > mFocusOffsetInitial; //-------------------------------------------------------------------- // Position |