livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,376 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

698 Commits (a9ffc0120a99462229d78b39b4d92dfd34309f4c)

Author SHA1 Message Date
Kitty Barnett a9ffc0120a Merged with default tip (Revision 13149a524874) 
--HG--
branch : RLVa
 2013-05-06 23:54:58 +02:00
Kitty Barnett 9177903931 Merged with Appearance-MixedViewers tip 
--HG--
branch : .RLVa
 2013-04-29 15:39:42 +02: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
Kitty Barnett 4101c43f5f Merged with viewer-sunshine tip (Revision 87a6fc812214) 
--HG--
branch : RLVa
 2013-02-20 19:25:10 +01:00
Kitty Barnett e1526c4048 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-20 14:26:21 +01:00
Kitty Barnett 2721b080d6 Merged with viewer-sunshine tip (Revision 87a6fc812214) 
--HG--
branch : Appearance-Misc
 2013-02-20 13:33:23 +01:00
Kitty Barnett 1c6729856d - internal : minor clean-up of various attachment detaching code 
--HG--
branch : RLVa
 2013-02-14 00:08:30 +01:00
Kitty Barnett e1b955226d Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : RLVa
 2013-02-11 23:04:05 +01:00
Merov Linden 2aee8f6fbe CHUI-730 : Fixed! Only clear out More sub menus in inventory 2013-02-05 21:11:33 -08:00
Kitty Barnett b368a21202 Merged with Appearance-Misc tip 
--HG--
branch : .RLVa
 2013-02-04 21:06:34 +01:00
Kitty Barnett bdd663cebb - internal : reviewed Appearance-Misc patchset for viewer-sunshine 
--HG--
branch : Appearance-Misc
 2013-02-04 20:09:37 +01:00
Kitty Barnett 9722d20390 Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : Appearance-Misc
 2013-02-04 13:32:16 +01: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
Merov Linden be3cfd872b CHUI-649 : WIP : Cleanup code to make it readable 2013-01-09 20:20:32 -08:00
Merov Linden 6fe7144104 CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary 2012-12-17 18:59:01 -08:00
Brad Payne (Vir Linden) 0777f53e2f SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents 2012-12-10 14:47:17 -05:00
Merov Linden 42a60e6ca5 Pull merge from dev repo 2012-12-05 20:26:26 -08:00
Merov Linden 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
Merov Linden a4a2cc62c3 CHUI-509 : Fixed : Add params to inventory widgets to control font colors (required for library items and links). 2012-12-05 16:08:17 -08:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
maksymsproductengine df1fd5d4bb CHUI-508 FIXED Attach to and Attach to HUD menus not showing in inventory floater to select attachment point 2012-11-14 00:07:46 +02:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed: 
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
 2012-11-09 12:45:36 +02:00
William Todd Stinson c4eaaa3d6a CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode. 2012-11-08 12:35:15 -08:00
Gilbert Gonzales 1a1a0b91c0 CHUI-383: Realized that prior changes for this bug caused a regress. The regress was using the people panel or a notecard to start a im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to LLIMFloater::show() to LLIMFloaterContainer::showConversation(), which will first select the conversation line item and then show the corresponding conversation floater. 2012-10-26 16:49:22 -07:00
maksymsproductengine 1251f45e62 CHUI-394 FIXED Group moderation tools missing in right click menus 2012-10-17 00:16:18 +03:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
maxim_productengine 2c15f6eca6 CHUI-354 FIXED getIconOverlay() is added for LLItemBridge 2012-10-03 13:30:17 +03:00
Kitty Barnett 5b7edaec37 Merged with .RLVa tip 
--HG--
branch : RLVa
 2012-09-20 16:37:37 +02:00
Kitty Barnett 4c9f7abec9 Merged with Appearance-MixedViewers tip 
--HG--
branch : .RLVa
 2012-09-20 16:35:22 +02:00
Kitty Barnett 578da42be3 Merged with default tip (Revision 7a056d7afeb2) 
--HG--
branch : Appearance-Misc
 2012-09-14 22:19:29 +02: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
Gilbert Gonzales d41202336b CHUI-303: Problem was that the prior solution only updated (using dirtyFilter()) the inventory window that the paste occurred in. Resolution: Now each inventory window calls dirtyFilter(), which then determines visibility of the pasted item. 2012-09-04 14:21:25 -07:00
Don Kjer 403d1b6404 Merge VirLinden/sunshine -> don_linden/sunshine-experimental 2012-09-03 20:12:47 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Gilbert Gonzales 31d69a6bc5 merging in latest changes 2012-08-24 13:57:57 -07:00
Gilbert Gonzales 6e92b96e88 kicking off another build (whitespace change) 2012-08-24 13:53:17 -07:00
Gilbert Gonzales 42701ad323 CHUI-303: Problem: When pasting the item, the item's filtering flag was not updated. The filtering flag determines visibility. Resolution: Upon pasting the item to the folder from the clipboard, update the filtering flag so that visibility can properly be determined. 2012-08-23 15:14:04 -07:00
Todd Stinson 6d84272d38 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-23 15:11:10 -07:00
Brad Payne (Vir Linden) 48d9dc9a8e merge 2012-08-22 15:49:38 -04:00
Brad Payne (Vir Linden) 40df1bba97 SH-3625 WIP - consolidating code paths for removal, removed dead code 2012-08-21 17:58:26 -04:00
Brad Payne (Vir Linden) b232919c0a SH-3625 WIP - consolidating code paths for wearable/attachment removal 2012-08-21 17:03:42 -04:00
Oz Linden 557376b95c merge changes for storm-1898 2012-08-16 10:41:10 -04:00
Gilbert Gonzales 41cba389f8 CHUI-269: Problem: When an item was purchased and delivered into the 'Received Items' panel, the badge icon and new item count would not show. This was due to the creation date of the folders not being set when a new item was added. Resolution: Now when an item is added into the 'Received Items' panel, the folder hierachy is updated, triggering the badge icon and new item count to show. 2012-08-16 12:14:25 -07:00