diff options
| author | Tofu Buzzard <no-email> | 2011-03-10 10:21:07 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-10 10:21:07 -0800 |
| commit | 5c6f86e158b547a0a686a3ab9d01d55b3787e48c (patch) | |
| tree | da6f149a9c8e80fcd2d40312a2338ddae6c07adc | |
| parent | 1aa6b7c770ed8bdbcd0c854cd8008f2f9538acae (diff) | |
| parent | fb00d280403b2befd645b8a80c3d9a3183e4c02c (diff) | |
merge
| -rw-r--r-- | indra/llrender/llglheaders.h | 8 | ||||
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 6e5f7110af..c48e2bb5fa 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -847,4 +847,12 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); #define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B #endif +//GL_ATI_meminfo constants +#ifndef GL_ATI_meminfo +#define GL_ATI_meminfo +#define GL_VBO_FREE_MEMORY_ATI 0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD +#endif + #endif // LL_LLGLHEADERS_H diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 2825c32d79..f5fd33d5e0 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -393,10 +393,12 @@ LLVector3 LLAgentCamera::calcFocusOffset(LLViewerObject *object, LLVector3 origi { return original_focus_point - obj_pos; } - LLQuaternion inv_obj_rot = ~obj_rot; // get inverse of rotation - LLVector3 object_extents = object->getScale(); + LLVector3 object_extents; + const LLVector4a* oe4 = object->mDrawable->getSpatialExtents(); + object_extents.set( oe4[1][0], oe4[1][1], oe4[1][2] ); + // make sure they object extents are non-zero object_extents.clamp(0.001f, F32_MAX); |