Commit Graph

144 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Leslie Linden 990b5aea2b EXP-1769 FIX -- Crash in ASSERT (mInDraw == false) - can trigger with selecting build tool
* Fixed build window to not fail assert at construction time.
2012-01-04 17:34:11 -08:00
Seth ProductEngine ca8a484f0e SH-2169 FIXED Land impacts data added to build tools floater.
Land selection moved from advanced weights floater to build tools floater.
Removed selection observer from weights floater, selection data update in it is initiated from build floater.
2011-08-22 19:18:36 +03:00
Brad Payne (Vir Linden) 94f3432871 Remove ShowAdvancedBuilderOptions, now always enabled 2011-08-18 11:22:55 -04:00
Seth ProductEngine 543df6736f SH-2171 FIXED New prim weights added to weights detail floater.
- Fixed detecting cross-parcel objects selection.
- Various fixes in LLAccountingCostManager.
- getSelectedObjectRenderCost() moved from LLFloaterTools to LLObjectSelection where it used to reside. Previous commented out implementation of this method removed.
2011-08-17 01:42:21 +03:00
prep linden b9247373fb Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup of old code related to earlier accounting work. 2011-08-02 17:01:46 -04:00
seth_productengine 6c7653c65b SH-2169 FIXED New object weights floater added. 2011-07-28 18:41:43 +03:00
Xiaohong Bao 5d25338ed0 fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit linked when Mesh disabled 2011-07-12 14:42:56 -06:00
Brad Payne (Vir Linden) 4bce553a96 merge viewer-development -> mesh-development 2011-07-01 09:41:10 -04:00
Nyx (Neal Orman) 41f3080d93 SH-1917 SH-1935 FIX PE cost is not always shown, includes unnecessary digits
Reformatted line showing prim equiv values, formatted to an integer,
removed old Render Cost display, and updated label of new display.
2011-06-28 15:36:26 -04:00
Paul ProductEngine 9afc77ba0a SH-1719 FIXED Viewer side cleanup of presentation of accounting data in build tools
- Moved grid mode combo box to the grid options floater

- Updated UI of the build floater according to the spec

- Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers
2011-06-21 21:00:06 +03:00
Wolfpup Lowenhar edc0e31bc2 STORM-1393 : Correction for loss of object/prim counts in the Build floater for
non-mesh objects.
2011-06-20 11:55:46 -04:00
Dave Parks d6730fddf6 don't use quota accounting manager 2011-06-08 00:16:02 -05:00
Roxie Linden 31e850d048 transplant fix for SH-1467
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
2011-05-27 11:50:39 -07:00
prep linden 0b612741d5 SH-1252 and SH-1253 WIP. 2011-05-20 14:26:05 -04:00
Leyla Farazha 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
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Paul ProductEngine 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
leyla_linden 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
leyla_linden d0bf3079d7 SH-840 Convert resource cost physics cost to prim count 2011-02-09 10:53:38 -08:00
Nyx (Neal Orman) 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
leyla_linden 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
leyla_linden ca1c1eea78 SH-808 Selectively enable/disable features in edit tools 2011-01-19 11:38:34 -08:00
Nyx (Neal Orman) 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
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
WoLf 65185139cc First sweep of changes for settings (and a few functions) from Phoenix prefix to FS. 2011-10-10 06:10:45 +02:00
WoLf d654b40424 Moved the ruler mode back on Build floater and removed from build options (Fixes FIRE-2891) 2011-09-16 00:43:13 +02:00
Mobius 791970c606 Backed out changeset: 5cfdbe627ccd 2011-08-29 22:07:41 +01:00
Mobius e8bca0664d Root prim is always link zero, not one... 2011-08-29 21:16:12 +01:00
Tonya Souther dc274b8905 Clean up edit tool floater. Fixes FIRE-2805. 2011-08-28 21:12:33 -05:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Kadah bd2c153cc0 Build Improvements: Show selected face numbers 2011-06-26 16:52:21 -07:00
Kadah 289ec1ef8b Build Improvements: Expand/Collapse button
And minor cleanup
2011-06-25 04:02:23 -07:00
Kadah dd34b50fb5 Build Improvements: Added button for copy keys to clipboard 2011-06-23 00:40:21 -07:00
Kadah b6d1bb78ce Build Improvements: FIRE-1576: Build Floater adjustment for German 2011-06-22 13:18:50 -07:00
Kadah 4c1e4f8037 Build Improvements: Link number of build floater (with same bugs as Phoenix) 2011-06-19 23:53:26 -07:00
Kadah 0fb75778fa Build Improvements: Pivot point controls 2011-06-19 21:44:49 -07:00
Kadah c34e638593 Build Improvements: Object highlight toggle on build floater 2011-06-19 21:24:29 -07:00
Arrehn 9464004fcc FIRE-940 , "Stretch Both Sides" text clickable on build floater. Thanks Ansariel Hiller 2011-04-23 10:56:49 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Liny 1bc52a7855 Adding Quarl's prim alignment tool into firestorm with a few tweaks.
The tweaks are that it runs in a seprate thread and it prints out to the log ALOT less often.
It also has client side perms checking to see if your allowed to move the prims in the first place
2011-01-26 16:08:54 -08:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks b70ccfe8e3 Add pure physics cost to UI 2010-10-07 14:00:43 -05:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Dave Parks 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
Nyx (Neal Orman) 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
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07:00