| Age | Commit message (Collapse) | Author | 
|---|
|  | VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline) | 
|  | viewer-public merge) | 
|  | back-out the back-out for this branch.  yay. | 
|  | Backing out this merge that I pushed (prematurely) to the wrong place. | 
|  |  | 
|  | Port of svn changset 3458 from Snowglobe, with minor tweaks. | 
|  |  | 
|  | Improved the following:
1, make sure the texture callback queue is properly handled and cleaned in time;
2, estimate the LLVOTree pixel area more accurately;
3, eliminate the possibility of back and forth stopping/restarting a texture fetching | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | making content appear to be of poor quality.
Patch by Thickbrick, reviewed by me. | 
|  | deferred rendering)
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b) | 
|  |  | 
|  |  | 
|  |  | 
|  | Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers. | 
|  |  | 
|  |  | 
|  | returns bad values. | 
|  | Checker: FORWARD_NULL
Function: LLFace::switchTexture(LLViewerTexture *)
File: /indra/newview/llface.cpp
not a bug. | 
|  | Checker: FORWARD_NULL
Function: LLFace::getGeometryVolume(const LLVolume &, const int &, const LLMatrix4 &, const LLMatrix3 &, const unsigned short &)
File: /indra/newview/llface.cpp | 
|  | Checker: UNINIT_CTOR
Function: LLFace::LLFace(LLDrawable *, LLViewerObject *)
File: /indra/newview/llface.h | 
|  | Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff | 
|  | getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard. | 
|  |  | 
|  |  | 
|  |  | 
|  | textures. | 
|  |  | 
|  | Reviewed by Bao | 
|  | to be reviewed by davep. | 
|  | media is loading. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0. | 
|  | fixes all of the parentheses warnings in the code.
Original patch was reviewed by merov (and others). | 
|  | Self reviewed. | 
|  |  | 
|  | svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql | 
|  | (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833 | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release | 
|  | merge viewer_1-21 96116-97380 -> release | 
|  | merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL | 
|  | release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation. | 
|  | svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4 | 
|  | QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release |