diff options
author | James Cook <james@lindenlab.com> | 2009-11-23 14:46:47 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-23 14:46:47 -0800 |
commit | 620de712c44e2229158d93e456d500a65d842b8d (patch) | |
tree | 42ee8997deefa0333ca8ff75da49cd4f58750371 /indra/newview/llglsandbox.cpp | |
parent | 7bfa11ed694f9fffa9d8983f3d60f740d630cfc2 (diff) | |
parent | 070c3a1e4b52005f4671e9143169332bebe06633 (diff) |
merge, manual conflict fix panel_bottomtray.xml, talk_button.xml, llfloaternearbymedia.cpp
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
-rw-r--r-- | indra/newview/llglsandbox.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 43fbe362d5..750a9d478f 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -67,7 +67,10 @@ #include "llresmgr.h" #include "pipeline.h" #include "llspatialpartition.h" - + +// Height of the yellow selection highlight posts for land +const F32 PARCEL_POST_HEIGHT = 0.666f; + BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position) { if(object && object->isAttachment()) |