Commit Graph

212 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Brad Payne (Vir Linden) 6d46132ef5 SH-4216 WIP - finished item/cat update and reorg of aisv3 code 2013-06-10 16:29:10 -04:00
Brad Payne (Vir Linden) f7c9739fd9 SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived. 2013-06-05 15:13:48 -04:00
Brad Payne (Vir Linden) 34d2cd0376 SH-4207 WIP - use item updates with callback when updating link descriptions. Reworked updateAppearanceFromCOF() cof-validation stages. 2013-05-24 15:51:33 -04:00
Brad Payne (Vir Linden) 6c56c77ec5 SH-4027 WIP - initial implementation of item update via AIS. 2013-05-24 08:53:21 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Brad Payne (Vir Linden) d843a0d8be SH-4137 WIP - added callback-based support for purge descendents, remove category 2013-04-25 17:09:05 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 46ab23c94b llinventory merge fixes 2013-03-11 18:02:16 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Brad Payne (Vir Linden) f48011e4d0 SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump 2013-01-15 20:30:20 -05:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Kelly Washington fe04921c21 MAINT-1601 Land remains for sale after purchasing for group.
reviewed with Simon
2012-09-21 13:32:25 -07:00
Don Kjer 7153d1db11 Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
Don Kjer 8ba2b38876 Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing. 2012-09-13 10:25:48 +00:00
Don Kjer cf7eb79fa7 Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender. 2012-09-08 04:39:11 +00:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Seth ProductEngine 4e7c2c6942 CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some folders reporting wrong creation date. 2012-08-02 22:49:42 +03:00
Oz Linden df93749819 merge up to latest viewer-development 2012-07-31 14:55:15 -04:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Richard Linden 3882e9c177 CHUI-101 WIP Make LLFolderview general purpose
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
2012-06-20 00:19:05 -07:00
Oz Linden d36f74ba33 merge changes for storm-1843 2012-06-18 12:50:15 -04:00
Richard Linden 86103dd5d4 Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui-folderview 2012-06-15 09:56:47 -07:00
Richard Linden 9940ca5ae7 CHUI-101 WIP Make LLFolderView general purpose
llfolderview refactornig
2012-06-15 09:44:27 -07:00
Kadah_Coba 070c722631 storm-1843: remove unused ParcelMediaURLFilter code 2012-06-11 12:20:09 -07:00
Seth ProductEngine 9b92235291 CHUI-120 WIP Added conversations participants drag and drop from avatar lists to IM floaters.
- Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER.
- Disabled calling card drop support as it is considered obsolete.
2012-06-08 01:08:58 +03:00
Oz Linden 0248aa5ec2 merge changes for storm-1839 2012-05-01 13:27:02 -04:00
Jonathan Yap 9df3afc1ef STORM-1839 Banlines need to be extended from 768 meters to 5000 meters now that explicit ban height has been changed. 2012-04-06 09:48:54 -04:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Vadim ProductEngine 4005a820f2 EXP-1563 FIXED Negative upload cost displayed on the "Save to My Inventory" button.
Update upload cost in the button label when economy data arrives from server.
2011-11-11 01:37:41 +02:00
Richard Nelson e61da05739 merge with viewer-development 2011-10-05 13:01:29 -07:00
Merov Linden cd467cc34f EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks into the LLToolDragAndDrop system in to support the new AT_WIDGET and SOURCE_VIEWER 2011-10-03 16:27:24 -07:00
Brad Payne (Vir Linden) af8864c49c merge 2011-08-19 09:41:50 -04:00
Brad Payne (Vir Linden) 0325d9060e merge 2011-08-18 17:25:48 -04:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Richard Nelson 11005a9d91 added fast timers to profile inventory LLSD deserialization 2011-08-10 10:52:56 -07: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
simon@lindenlab.com 918238dd18 ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
Privacy" changes.  Many naming changes for the featureto be "See avatars"
instead of "hidden avatars".  Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
2011-07-01 14:06:08 -07:00
simon@lindenlab.com c0c0a2b9a5 ER-944: Add feature to control user sounds on a parcel. Added new checkboxes
to the About Land / Sound tab.  Reviewed by Kelly.
2011-06-20 09:28:10 -07:00
Dave SIMmONs 5039378869 ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars" 2011-06-09 13:46:19 -07:00
Dave SIMmONs 484a4733b7 Merge latest from lindenlab/viewer-development/ 2011-06-08 14:53:00 -07:00
Dave SIMmONs 3dfb4944ed Merge latest from lindenlab/viewer-development 2011-05-24 10:51:09 -07:00
Dave SIMmONs 1a5b3b0a90 ER-914: Disable Parcel Privacy UI in viewer if on older sim 2011-05-24 10:44:27 -07:00