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

80 Commits (5fa00a67af6364554c05eb3ca0339770fa6da455)

Author SHA1 Message Date
Loren Shih 5d3de2ea03 EXT-6745 : Refactor LLFetchComboObserver to use LLFetchItems and LLFetchDescedents instead of code duplication 
Took out a bunch of code duplication from the FetchComboObserver and am using the LLFetchItems/DescendentsObservers instead.  Also added some comments and made some minor superficial cleanup to LLInventoryObserver done().
 2010-04-07 13:30:21 -04:00
Loren Shih e9f0676441 EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class 
Minor cleanup of LLInventoryFetchComboObserver
 2010-04-07 11:15:27 -04:00
Loren Shih f096f02278 EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class 
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
 2010-04-06 18:58:26 -04:00
Loren Shih cdbdb11686 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically 
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
 2010-04-06 14:47:20 -04:00
Loren Shih 785d4c34b6 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically 
Preliminary work to clean up naming conventions.
 2010-04-06 10:19:15 -04:00
Loren Shih 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
Loren Shih 568d6ed229 EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'s 
Fixed some more typedefs that I missed in first checkin.
 2010-04-02 15:19:44 -04:00
Richard Nelson 2bb03e5edb EXT-6525 - drag threshold is very low for navbar favorites 
reviewed by Leyla
 2010-03-30 16:30:31 -07:00
Loren Shih 909091cc0c EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class 
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
 2010-03-30 15:56:15 -04:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s 
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
 2010-03-29 16:33:35 -04:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton 
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
 2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton 
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
 2010-03-29 12:00:26 -04:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Brad Payne (Vir Linden) 4ff53b9066 For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout 2010-03-29 11:02:39 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton 
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
 2010-03-26 14:33:48 -04:00
Loren Shih 0bcfbde3a4 EXT-6536 : Make LLVOAvatarSelf a singleton 
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
 2010-03-26 13:58:19 -04:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih 885fc3f9b5 EXT-6536 : Make LLVOAvatarSelf a singleton 
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
 2010-03-25 19:56:52 -04:00
Loren Shih 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
Andrew Dyukov 978bf16797 Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet). 
- Removed unnecessary string in strings.xml and substituted it in code with existing one.

--HG--
branch : product-engine
 2010-03-18 21:51:27 +02:00
Andrew Dyukov da3d0b104a Fixed reopened normal sub-task EXT-5950 (Do not spawn IM chiclet for "drop on avatar" inventory offers). 
- Added logging of "Inventory item offered" message when dnd'ing item on avatar via new LLToolDragAndDrop::logInventoryOffer() method.

--HG--
branch : product-engine
 2010-03-12 16:18:56 +02:00
Tofu Linden 45e15b0b50 CID-197 
Checker: RESOURCE_LEAK
Function: LLToolDragAndDrop::giveInventoryCategory(const LLUUID &, LLInventoryCategory *, const LLUUID &)
File: /indra/newview/lltooldraganddrop.cpp
 2010-01-27 14:42:32 -08:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
Mike Antipov d6e22a7579 Fixed major bug EXT-3191 (Crash after dragging inventory item to avatar or IM floater) 
Reason: Null pointer to cargo data was passed from LLToolDragAndDrop::dragOrDrop in this case.
Fix: added check against NULL of the LLToolDragAndDrop::locateInventory() result in the LLToolDragAndDrop::dragOrDrop().
 The same checking presents in another place of the LLToolDragAndDrop::dragOrDrop().
 Handling is interrupted in this case.
Thanks Andrew ProductEngine for provided call stack

--HG--
branch : product-engine
 2009-12-08 10:03:34 +02:00
James Cook bbddb24739 Fix Linux/Mac builds due to LLToolDragAndDrop member function pointers 2009-12-01 13:03:35 -08:00
Loren Shih 27351b8bf5 automated merge for viewer-2.0 -> avp. 
--HG--
branch : avatar-pipeline
 2009-12-01 12:52:21 -05:00
Loren Shih f0f0572868 EXT-2964 : Can drag-and-drop a folder with links onto an object 
EXT-3012 : Cleanup LLToolDragAndDrop

Now checking if folder contents have links before allowing object drop.
Did some superficial cleanup of lltooldraganddrop files.

--HG--
branch : avatar-pipeline
 2009-12-01 12:43:36 -05:00
Loren Shih 1f1afc253d INFRASTRUCTURE: LLToolDragAndDrop cleanup 
Includes removal of unused header files.
Includes changing big static map into a lldictionary.

--HG--
branch : avatar-pipeline
 2009-11-30 17:17:59 -05:00
James Cook 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
James Cook 0e351bedb6 Removed llnotifications.h from all headers by adding llnotificationsptr.h 
Fixed many more includes
 2009-11-24 22:55:56 -08:00
Brad Payne (Vir Linden) 0b104e2a41 LLAppearanceManager cleanup - turning into proper singleton 
--HG--
branch : avatar-pipeline
 2009-11-12 15:10:06 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Loren Shih 584962d5c7 svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
 2009-10-23 15:21:49 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
 2009-10-03 23:40:28 +00:00
Steven Bennetts 606b381c9f merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3 
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
 2009-09-29 19:37:05 +00:00
Bradley Payne 73d152093d For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. 
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
 2009-09-10 18:42:19 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
 2009-08-28 22:58:17 +00:00
Steven Bennetts af98aad98d svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
 2009-08-26 20:47:27 +00:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +00:00
Loren Shih f5ba6df4c2 svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 
includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames

For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER]
For DEV-36563 : Remove mAcceptsCallingCardNames

Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects.
* Test creating landmarks.

Test plans - INTERNAL
* Test against any inventory permissions smoke tests.
* See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
 2009-07-24 16:20:15 +00:00
Loren Shih 363de6c3bc svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]

Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types.  Test inventory operations on these folder types.

Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan.
 2009-07-23 23:41:12 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
 2009-07-07 00:53:05 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge 
Melinda (coco): 5th and final batch of featurettes. My work here is done.
 2009-03-13 21:28:40 +00:00
Eric Tulla 6db6d81b0a Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). 
No conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
 2009-03-05 00:29:27 +00:00
Andrew Meadows 15a6d273cc svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +00:00