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
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
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
c3d9316dff
EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a vector of items)
...
Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06 17:30:23 -04:00
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
ec5bd9c857
automated merge
2010-04-06 10:19:31 -04:00
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
7187f08e89
wtf-fix for using \\ instead of // as a comment.
2010-04-06 15:13:15 +01:00
8ccffa6a1e
merge from PE viewer-hotfix
2010-04-06 13:20:28 +01:00
613c84fc67
merge
2010-04-06 13:18:35 +01:00
7bfa3e81e7
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Superficial header file cleanup.
Change made to simulator files as well.
2010-04-05 16:18:19 -04:00
b49165a9dd
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Superficial header file cleanup for LLInventoryFunctions.
Change made to simulator files as well.
2010-04-05 16:16:13 -04:00
d13dac1550
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
...
Superficial header file cleanup.
Change made to simulator files as well.
2010-04-05 16:13:02 -04: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
9bfc1c3b10
automated merge
2010-04-05 10:34:36 -04:00
3d0f02054e
Updated Mac build of LLQtWebKit library.
...
This was built from:
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-02 15:09:38 -07:00
98e46e28e0
Merge with tip
2010-04-02 14:57:12 -07:00
9e1b600d9b
DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of LLQtWebKit/Windows)
2010-04-02 14:27:13 -07:00
9007cf3a53
EXT-6696 : Make Library inventory items somehow distinguishable at first glance from My Inventory items
...
Library items are now set to Emphasis Color. This can be easily changed.
Also fixed an issue where the "(Loading...)" string was overlapping with folder inventory strings.
2010-04-02 17:12:13 -04:00
20c660569d
merge
2010-04-02 21:49:45 +01:00
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
2c5c563319
automated merge
2010-04-02 13:20:39 -04:00
fd04b26d34
automated merge
2010-04-02 13:14:12 -04:00
73827e8430
merge
2010-04-02 13:10:54 -04:00
5faa2444f9
merge
2010-04-02 12:51:39 -04:00
36987904d4
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-02 10:40:48 -06:00
8cd95bd12a
add some debug code for EXT-5394: Crash in LLViewerMediaImpl::calculateInterest()
2010-04-02 10:33:20 -06:00
873de2daae
automated merge
2010-04-02 12:32:56 -04:00
580ecaefca
EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
...
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:56:52 -04:00
825e4df30d
EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
...
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:12:59 -04:00
a3ba5836f0
Cleanup
2010-04-02 09:54:29 -04:00
e46f128d20
PE merge
2010-04-02 12:35:24 +01:00
32283a93e0
Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) - added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater.
...
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/
--HG--
branch : product-engine
2010-04-02 13:36:58 +03:00
81582cb376
Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat history) - added new 'ChatTimestampColor' color setting, which is set to timestamps for chat history messages in text mode which are not from log.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/160/ .
--HG--
branch : product-engine
2010-04-02 13:15:50 +03:00
a7085418df
Automated merge
2010-04-02 02:06:04 -07:00
9523c70f9d
DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
...
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser). Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)
Also, refactor of voice to modularize it, and add a diamondware voice module.
CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
947bd99488
Incorporate Aimees code review comments
2010-04-01 21:07:49 -07:00
18d9efff12
another fix for bad merge
2010-04-01 16:43:58 -07:00
a9b806071a
fix for bad merge
2010-04-01 16:41:45 -07:00
be16153af8
added newline at eof
2010-04-01 16:19:03 -07:00
f252d0d1a0
merge
2010-04-01 15:51:24 -07:00
dcc5e0a4fa
EXT-3531 - Ctrl-p doesn't work reliably on login
...
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01 15:48:56 -07:00
51e1c6b78a
merge
2010-04-01 15:46:34 -07:00
ca8da832bd
fixed line endings
2010-04-01 15:35:55 -07:00
db0ffdf270
Merge
2010-04-01 15:33:05 -07:00
cec9bce226
Cleanup and consolidation
2010-04-01 18:18:00 -04:00
959ec0c305
EXT-3792 Legacy menus are still displayed in Inventory in Inventory side panel
...
reviewed by Richard CC#176
2010-04-01 15:13:03 -07:00
8a22ffa622
EXT-5110 Save Outfit dialog is non-standard modal dialog (off-center placement, empty titlebar)
...
reviewed by Richard CC#176
2010-04-01 15:12:20 -07:00
38c1bc9e9a
EXT-5179 In Prefs->Setup, move Other Devices to bottom of window or to advanced EXT-5170 prefs review: move UI size to advanced
...
reviewed by Richard CC#176
2010-04-01 15:11:13 -07:00
Loren Shih