5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
3a49beed0e
CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05 20:25:46 -08:00
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
b183b6f141
EXP-1196 FIX Fix param block template ordering
...
changed ordering of template loading relative to constructor setting of params
moved a lot of constructor-set params to template files
reviewed by Leslie
2011-09-06 14:45:11 -07:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
569f3f4b06
Merge
2010-09-22 13:04:53 -07:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
37a8c12bd3
merge
2010-06-14 23:04:11 -05:00
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
e414a91d7f
EXT-7430 : Create art overlay for inventory icons that are links
...
Took out explicit _Link icons and replaced with overlay.
Removed links overlays from non-main-inventory-floater panels.
2010-06-09 17:09:42 -04:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
9bb097000c
update group notice panel and group notice to optionally use username if using display names
2010-05-27 15:49:22 -07:00
6cb420b20b
added function for building a username from a legacy name and fixed group notice panel
...
reviewed by James
2010-05-27 15:12:03 -07:00
2920d4c46f
merge
2010-05-24 16:37:52 -07:00
5c370550bf
EXT-6710 WIP Prepare to implementation - "Give inventory" related functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory.
...
To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it.
No functionality should be changed.
LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones.
There were moved methods related to:
- give inventory item
- give inventory category
- log into chat
Such functionality was moved:
- is give acceptable
- do inventory give operation
- send give inventory request to server
- process give inventory for protected items
QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely.
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/
--HG--
branch : product-engine
2010-05-21 13:16:29 +03:00
8b52454990
merge pull from dessie/viewer-public, picking up SLE code
2010-05-13 15:47:32 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
35bf78478c
EXT-7306 : FIXED : Add shortcut-style icons for inventory links
...
EXT-7312 : FIXED : INFRASTRUCTURE : Cleanup LLPanelObjectInventory
Fixed a few minor bugs with LLInventoryIcon being called with incorrect arguments.
Big cleanup of LLPanelobjectInventory to make better use of inheritance.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11 17:43:00 -04:00
64da5083d0
EXT-7306 : FIXED : Add shortcut-style icons for inventory links
...
EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code
Inventory link icons were designed from scratch.
Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11 13:01:27 -04:00
72a94da05b
merge from viewer-trunk
2010-04-27 08:35:32 +01:00
24894a5f71
EXT-6969 Group notices can appear duplicated in group profile
...
reviewed Mike Antipov
https://codereview.productengine.com/secondlife/r/308/
--HG--
branch : product-engine
2010-04-26 18:58:48 +03:00
438f0e372e
merge from viewer-trunk
2010-04-26 10:57:51 +01:00
583e1951bf
EXT-6970 Title of attachment from previously viewed group can be found in current group while viewing notices
...
reviewed Mike Antipov
https://codereview.productengine.com/secondlife/r/306/
--HG--
branch : product-engine
2010-04-23 15:48:58 +03:00
1dade05ee7
YET another hairy merge from viewer-trunk. Conflicts resolved... so far.
2010-04-06 16:10:16 +01:00
2eba9819df
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
dcbbf64c41
merge
2010-02-22 14:20:50 -08:00
57fe28e439
fix for normal "Archived Notice" field not cleared when looking at notice list of another group
...
--HG--
branch : product-engine
2010-02-22 14:30:06 +02:00
ffb741f862
DEV-46233 From field in group notices table contains SLID with Resident
...
Raw name being sent from server
2010-02-17 09:48:43 -08:00
e2612effbe
merge from viewer2
2010-01-29 12:09:37 -08:00
837f6c7cbe
Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
...
-- Implemented storage to save favorite landmarks order in local file.
-- Previously implemented solution to store sort index in Landmark's name replaced with using the storage.
For now all landmarks are shown as is (with sort LM prefix if it exists).
-- Some deprecated methods are marked to be removed later
-- Reverted fixes for: EXT-4306, EXT-1237, EXT-1615 as not necessary, these bugs should be verified again.
--HG--
branch : product-engine
2010-01-27 17:29:44 +02:00
a65188d85f
Merge from viewer2. Minor conflict resolved.
2010-01-20 13:54:34 -08:00
5c4ab75cda
Fixed low bug EXT-4306 - Landmark name is shown with prefix in the group notice attachment.
...
--HG--
branch : product-engine
2010-01-18 13:18:46 +02:00
85488f5414
Merge of viewer 2 changes
2009-12-07 16:03:56 -08:00
3b05656ba1
fix for normal EXT-2913 [BSI] Archived notice of Group1 is shown in any group Group2 until other notice is selected
...
--HG--
branch : product-engine
2009-12-03 14:13:21 +02:00
abbf49759d
EXT-2911 [BSI] Unable to select any *old* notice in the Group Notice Archive
...
--HG--
branch : product-engine
2009-12-02 18:30:31 +02:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
6f3536d597
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
2009-11-11 15:16:49 -08:00
bde7d67066
EXT-1866 : Inventory Side Panel
...
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel
Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
Richard Linden