Commit Graph

16072 Commits (01d219ed4c140fbc54069cdcb6d1b671f91e9923)

Author SHA1 Message Date
Nyx (Neal Orman) 01d219ed4c removing particle disabling from performance testing so that I can test performance of particles 2011-02-01 17:26:23 -05:00
Nyx (Neal Orman) d1683bd65a glFlush != glFinish. doh. 2011-01-13 13:46:00 -05:00
Nyx (Neal Orman) 8fae5d49bf testing: adding glFlush() each frame for performance testing 2011-01-07 18:24:35 -05:00
Brad Payne (Vir Linden) f71228bf90 merge 2011-01-07 15:22:13 -05:00
Brad Payne (Vir Linden) 727a0e6fd4 expose << operator for LLMD5 objects in LL_COMMON_API 2011-01-07 15:20:48 -05:00
Dave Parks f0d0096cf9 merge 2011-01-07 13:48:22 -06:00
Dave Parks b4c62e1a17 Clean up some xml errors from settings.xml 2011-01-07 13:48:02 -06:00
Dave Parks ce5dc4d42b SH-762 Forsyth style vertex buffer optimization for meshes. 2011-01-07 13:47:50 -06:00
Loren Shih 61e3c95dbf Automated merge up from viewer-development 2011-01-07 10:14:33 -05:00
Loren Shih 38ab285114 Automated merge from mesh-development 2011-01-07 10:14:22 -05:00
Oz Linden 09c01c4e92 Automated merge with file:///Users/oz/Work/V-D 2011-01-06 21:38:05 -05:00
Oz Linden 9833f43664 merge changes for web profiles 2011-01-06 19:20:54 -05:00
Loren Shih 1edf6b34c2 SH-700 FIXED Minor UI layout issue in Physics tab in Upload Model dialog
Shifted some elements up vertically to fit within UI box.
2011-01-06 18:00:08 -05:00
callum cf8a16366a SOCIAL-423 FIX Display name and username are wrong in My Profile tab 2011-01-06 13:41:04 -08:00
Brad Payne (Vir Linden) 8d2c4369da Validation check for edit classified and edit pick slapps 2011-01-06 16:31:27 -05:00
David Kaprielian 3f6fe6912a Syncing coverity build.sh code with trunk. 2011-01-06 13:08:00 -08:00
Loren Shih 3f0ddd758e SH-705 FIXED LOD layers error message is truncated
Expanded error message height, added linewrap.
2011-01-06 15:25:55 -05:00
Oz Linden 894e98a708 merge changes for storm-812 2011-01-06 14:33:35 -05:00
Oz Linden 94fbf99ac2 merge changes for storm-714 2011-01-06 14:32:01 -05:00
Oz Linden a9686db3e6 merge changes for storm-438 2011-01-06 14:31:17 -05:00
callum 9ece5ed510 Merge from viewer-development before merge to viewer-development request submitted 2011-01-06 10:59:41 -08:00
Nyx (Neal Orman) d8cf705d01 BUILDFIX: fixing linux build breakage
cleaning up a bit of syntax that gcc is complaining about.

reviewed by bao
2011-01-06 13:07:18 -05:00
Nyx (Neal Orman) e9e5806d67 Automated merge with https://hg.secondlife.com/mesh-development 2011-01-06 11:46:03 -05:00
Loren Shih b30ff3fb9a Automated merge up from viewer-development 2011-01-06 11:06:09 -05:00
Loren Shih 9c6c046327 Automated merge from mesh-development 2011-01-06 11:01:17 -05:00
Loren Shih 64ca3553b1 SH-690 FIXED Name field in Upload Model dialog allows unicode charaters to be entered which shows a blank name in inventory once uploaded
Disabled unicode character input.
2011-01-06 10:59:46 -05:00
callum b9ca6c553c Merge with viewer-development 2011-01-05 15:52:43 -08:00
callum ed3ea14984 SOCIAL-304 FIX Modify side panel to reflect Profiles changes 2011-01-05 15:49:57 -08:00
Oz Linden 1034db6394 merge changes for storm-806 2011-01-05 17:54:12 -05:00
Oz Linden eb0b8ab3ea merge changes for storm-825 2011-01-05 17:53:37 -05:00
Loren Shih d5a0c56bf5 SH-716 FIXED Water reflections should not default to ON for High graphics setting
Revert to previous behavior.  Reflections stay at "minimal".
2011-01-05 17:00:07 -05:00
Loren Shih c3501a4f23 Automated merge from viewer-development 2011-01-05 16:35:09 -05:00
Loren Shih 3b1a06b024 SH-716 FIXED Water reflections should not default to ON for High graphics setting
Revert to previous behavior.  Reflections stay at "minimal".
2011-01-05 16:31:29 -05:00
prep c9f3a5574e merge 2011-01-05 16:12:15 -05:00
prep 5b09da5079 Fix for SH-579 2011-01-05 16:07:16 -05:00
Loren Shih 7c7527b672 Automated merge up from viewer-development 2011-01-05 15:10:39 -05:00
Loren Shih df1c6d2a2e Automated merge from mesh-development 2011-01-05 15:10:31 -05:00
Loren Shih 0278321345 SH-741 FIXED Mesh assets cannot be dragged into notecards
Added DAD_MESH to list of text editor -allowed drag and drop types.
Minor tab reformatting.
2011-01-05 15:08:50 -05:00
prep dfddccd65d merge 2011-01-05 14:10:18 -05:00
prep c20f9342b9 patch for gl_any_samples_passed missing define on mac 2011-01-05 14:09:19 -05:00
Brad Payne (Vir Linden) b70a8ee0da fixed line endings again 2011-01-05 10:37:28 -05:00
Brad Payne (Vir Linden) a7db3b1786 merge 2011-01-05 10:37:00 -05:00
Dave Parks 875d36b083 merge 2011-01-05 01:23:37 -06:00
Dave Parks 9c31fd79fc SH-571 Fix for mesh shadows blinking on LoD switch. 2011-01-05 01:21:04 -06:00
Xiaohong Bao c876e78c10 trival: fix compiling errors for Linux. 2011-01-04 17:51:58 -07:00
Dave Parks 808cd0fcbf VWR-21927 Fix for water reflections causing LoD updates.
SH-735 Potential fix for ATI X1950 wasting time in occlusion culling.
2011-01-04 18:34:27 -06:00
Xiaohong Bao 4a29253a59 Automated merge with http://hg.secondlife.com/mesh-development 2011-01-04 16:50:42 -07:00
Loren Shih 83eb22f736 SH-739 Meshes can no longer be moved into subfolders of the "Meshes" folder
Did this ever work?  The code for handling drag&drop is broken completely for meshes; you can't drag them anywhere in inventory.
Also did some formatting/cleanup of related code.
2011-01-04 18:41:36 -05:00
Xiaohong Bao f1b7fce1db a debug tool to detect LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist.
This debug tool is off by default. To turn it on, set LL_REF_COUNT_DEBUG to be 1 in the header file "llcommon/llrefcount.h".
2011-01-04 16:28:40 -07:00
Xiaohong Bao 961e50aab4 clear some LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist. 2011-01-04 16:22:38 -07:00