673801e644
SH-1205 Lock out ability to change sculpt stitching type or sculpt map when sculpt stitching type is set to mesh
2011-03-24 12:31:24 -07:00
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
776dde83ed
STORM-889 FIXED Put Link/Unlink in Edit Panel
...
- Moved callbacks for Link/Unlink to the LLSelectMgr
- Binded Link/Unlink callbacks with buttons in Build Floater
- Replaced view_listener_t usage for Link, Unlink, EnableLink, EnableUnlink with boost::bind
2011-02-22 15:24:55 +02:00
d74c581360
SH-938 [REGRESSION] Mesh costs and old style costs shown in Edit tools on mesh region with MeshEnabled set to False
2011-02-09 15:09:15 -08:00
d0bf3079d7
SH-840 Convert resource cost physics cost to prim count
2011-02-09 10:53:38 -08:00
8b15ca8d6b
SH-930 FIX revert ARC algorithm for merge to viewer-development
...
Reverting incomplete changes to ARC so that we don't change RC when
we merge down.
2011-02-07 21:03:10 -05:00
ad54a46ba2
SH-841 Hide physics parameters in build tools when connected to a region that doesn't support additional physics parameters.
2011-01-28 12:22:51 -08:00
ca1c1eea78
SH-808 Selectively enable/disable features in edit tools
2011-01-19 11:38:34 -08:00
5e57352e12
SH-350 SH-351 SH-355 FIX Several fixes for ARC
...
Fixed the texture resolution calculation against the rounding errors
we had before.
Fixed the bug where linking prims changed the combined cost
Fixed the bug where twisting was not computed properly
Code reviewed by davep.
2010-11-18 16:42:57 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
b70ccfe8e3
Add pure physics cost to UI
2010-10-07 14:00:43 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
3cda760638
Added test code for volume raycast octree and fixed a crash in render cost calculation when selecting trees/grass. Reviewed by jwolk.
2010-09-10 14:08:12 -05:00
e3fec30097
CTS-231 WIP create new ARC algorithm to be more accurate and account for meshes
...
First pass - uses the new algorithm to hopefully be more accurate of render load
on low-end machines. Also accounts for mesh complexity, including if a mesh is
weighted or non-weighted.
Code reviewed by davep
2010-09-01 10:59:45 -04:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
671609239f
Added new UI to show linked set cost and object cost. Changed terminology in edit tools. Updated request payload when requesting object cost. Paired with davep
2010-08-13 17:30:09 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
9b526997d9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
7a54ce3cf6
EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startup
...
reviewed by Leyla
2010-06-22 13:42:55 -07:00
aab53dc250
merge
2010-06-10 15:16:08 -05:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
32ce71dd6e
EXT-6658 FIXED Fixed text overflow and truncation
...
- Made more vertical space between radio group and status text to avoid overlapping
- Moved by 5 pixels to the left \"checkbox fullbright\" checkbox to avoid trancation
- Replaced checkbox's label with TextBox to have ability to apply word_wrap for truncated label
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/430/
--HG--
branch : product-engine
2010-05-21 19:16:51 +03:00
246dd9c168
Highlight for object cost and proper retrieval/display of prim object cost and linkset cost.
2010-05-15 02:45:58 -05:00
61774546f0
HUGE merge from viewer-trunk. Many conflicts resolved.
2010-03-30 13:15:36 +01:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
b31d7cb22f
merge from viewer2.
2010-02-17 18:54:47 +00:00
3d3f72bd03
EXT-5172 set prefs review: "Allow media to auto-play" , media setting "auto play" and "auto scale" to 'true' by default
2010-02-17 15:51:17 +08:00
e2d56363f1
viewer2 merge.
2010-02-16 16:50:21 +00:00
3f6a19ddd3
EXT-5172 prefs review: Allow media to auto-play should be set by default
2010-02-16 19:03:49 +08:00
15ff4379e5
merge from viewer2 trunk.
2010-02-11 15:07:37 +00:00
03d7153e55
CID-67
...
Checker: FORWARD_NULL
Function: LLFloaterTools::updatePopup(LLCoordGL, unsigned int)
File: /indra/newview/llfloatertools.cpp
2010-02-11 14:18:54 +00:00
197c78fa4b
merge from viewer2 trunk.
2010-02-05 07:35:03 +00:00
a3781e07df
This file should have gone in with a previous changeset ( https://hg.lindenlab.com/viewer/viewer-2-0/changeset/dddb40b50424/ )
2010-02-04 14:53:33 -08:00
a65188d85f
Merge from viewer2. Minor conflict resolved.
2010-01-20 13:54:34 -08:00
6d952dd40d
FIX EXT-4468 DEV-41991: Make selected objects "more important" when loading their media data
2010-01-19 12:24:58 -08:00
b9852dde4b
Merge.
2010-01-13 14:16:24 -08:00
e4b7deae75
FIX EXT-3972: Don't put up the "multiple media" dialog just because the user doesn't have the "Select Face" tool selected.
2010-01-11 15:38:26 -08:00
9130cc4712
Merge from viewer2 trunk again - some fairly important fixes there.
2010-01-06 13:35:54 -08:00
8d2f925f26
EXT-3588 Grey-out "gear" icon if not all faces selected have media
...
We've gone back and forth on this, but we've decided that there are just too many ways to accidentally add media to multiple faces when you don't mean to. This helps in one small way: by disabling the gear icon unless all selected faces have media.
2010-01-05 17:01:40 -08:00
a0802dd339
Added prim cost equivalency to UI for importer and tools floater.
2009-12-22 17:48:52 -06:00
90bb29245c
EXT-3514 update debug settings for new appearance features
...
following changes:
1) remove renderavatarinvisible - no longer need this debug setting
2) add showobjectrenderingcost (default:TRUE) so we can turn this feature off if necessary
3) add showdebugappearanceeditor (default:FALSE) so we can test the future appearance editor
code reviewed by vir and seraph
--HG--
branch : avatar-pipeline
2009-12-16 12:15:18 -05:00
f51bf5d618
Merge
2009-12-11 12:36:46 -08:00
Leyla Farazha