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
e9e5806d67
Automated merge with https://hg.secondlife.com/mesh-development
2011-01-06 11:46:03 -05:00
c9f3a5574e
merge
2011-01-05 16:12:15 -05:00
5b09da5079
Fix for SH-579
2011-01-05 16:07:16 -05:00
7c7527b672
Automated merge up from viewer-development
2011-01-05 15:10:39 -05:00
df1c6d2a2e
Automated merge from mesh-development
2011-01-05 15:10:31 -05:00
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
dfddccd65d
merge
2011-01-05 14:10:18 -05:00
c20f9342b9
patch for gl_any_samples_passed missing define on mac
2011-01-05 14:09:19 -05:00
b70a8ee0da
fixed line endings again
2011-01-05 10:37:28 -05:00
a7db3b1786
merge
2011-01-05 10:37:00 -05:00
875d36b083
merge
2011-01-05 01:23:37 -06:00
9c31fd79fc
SH-571 Fix for mesh shadows blinking on LoD switch.
2011-01-05 01:21:04 -06:00
c876e78c10
trival: fix compiling errors for Linux.
2011-01-04 17:51:58 -07:00
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
4a29253a59
Automated merge with http://hg.secondlife.com/mesh-development
2011-01-04 16:50:42 -07:00
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
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
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
2729360a2d
Automated merge from mesh-development
2011-01-04 17:24:06 -05:00
e2f197b6f7
merge changes for storm-398
2011-01-04 16:46:09 -05:00
78895f9e0c
merge changes for storm-467
2011-01-04 16:45:08 -05:00
562ed9c4d4
merge changes for storm-485
2011-01-04 16:44:15 -05:00
05810f063d
merge changes for storm-737
2011-01-04 16:43:26 -05:00
e4591a8518
merge changes for storm-466
2011-01-04 16:41:05 -05:00
67ced403e6
merge changes for storm-513
2011-01-04 16:40:25 -05:00
7a2f0ba9a8
merge changes for storm-493
2011-01-04 16:39:53 -05:00
69b6aa5db2
merge changes for storm-669
2011-01-04 16:37:59 -05:00
12bc7eb017
merge changes for storm-823
2011-01-04 16:37:16 -05:00
8eda31456a
fixing mac build error
2011-01-04 10:18:15 -08:00
f6a325bb72
Automated merge with https://hg.secondlife.com/mesh-development
2011-01-04 13:11:34 -05:00
5fe826945c
Automated merge from mesh-development
2011-01-04 11:00:14 -05:00
1e647e2cd2
Faster occlusion queries (take advantage of GL_ARB_occlusion_query2 where available and don't read back result if it will block).
2010-12-31 18:41:54 -06:00
33d9b10fbb
SH-727 Working cancel button and cancel buttons for physics decomp stages.
2010-12-31 16:48:50 -06:00
350a736d37
Merge
2010-12-31 12:55:04 -08:00
d196348d0f
Physics stage of wizard
2010-12-31 12:53:39 -08:00
e3204165b9
automated merge
2010-12-30 22:09:16 -08:00
ca9df698db
Code review fix from davep - use booling or operator and not binary one
...
Remove unnecessary state check.
Initial dialog work for showing physics cost in upload dialog
2010-12-30 22:08:25 -08:00
f41b53059e
SH-508 Fix for frame stalls when adjusting skin weights.
2010-12-30 16:46:56 -06:00
13ec64e0e6
SH-714 Fix for skinned meshes being incorrectly scaled.
2010-12-30 16:07:18 -06:00
e68b03260f
Automated merge up from viewer-development
2010-12-30 16:30:36 -05:00
3348a1ecc0
line endings broken again
2010-12-30 14:53:54 -05:00
2b44c8919f
STORM-823 FIXED Fixed Tab Key not working properly in floaters.
...
Bug was caused by not fiding focus root in LLUICtrl::findRootMostFocusRoot() when tab was pressed in floaters. When it was not found, LLPanel::handleKeyHere() didn't move focus to the next control.
Floaters had erroneous behaviour because of focus_root xml param: though value of focus root was set with setFocusRoot() in floater's constructor , later it was overwritten in LLFloater::initFloaterXML() with value from xml again.
This problem was introduced in af49c237b0f9 - there focus root was moved to xml.
- To fix the problem, setFocusRoot() call was added after initFromParams() in LLFloater::initFloaterXML() to set proper value of focus root after overwriting it from xml.
The drawback of the fix is that focus_root param is ignored by floaters and its value is determined depending on chrome, as it did before but the only other way to fix this problem would be to set the param in xml manually for each existing floater, and do it for each new floater added to viewer.
2010-12-30 20:18:00 +02:00
cc3f0d287c
Automated merge from viewer-development
2010-12-30 13:11:44 -05:00
a62477d378
Automated merge with https://hg.secondlife.com/mesh-development
2010-12-30 11:56:59 -05:00
c3270fea74
BUG STORM-493 'Map' button slightly overlaps scroll bar into My Group info->Land/Assets accordion
...
- Decreased button width
2010-12-30 14:39:17 +02:00
67231c854e
BUG STORM-513 "Allow media to auto - play" check-box is enable after Media check-box was unchecked
...
- Now if "Media" check-box is unchecked, "Allow media to auto - play" check-box is disabled too.
2010-12-30 14:28:15 +02:00
fad456e2b1
SH-647 Switch asserts to warnings in octree for development builds (were already warnings in release builds).
2010-12-29 16:29:34 -06:00
6262c4a427
SH-632 Fix for auto generating mesh LODs sometimes reducing High LOD triangle count.
2010-12-29 15:48:59 -06:00
842dcb7e42
automated merge
2010-12-29 13:16:36 -08:00
Nyx (Neal Orman)