957055396d
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
2009-11-25 12:31:24 -08: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
a22bb00530
merge
...
--HG--
branch : avatar-pipeline
2009-11-24 12:10:10 -05:00
3263a6cbad
merge
...
--HG--
branch : avatar-pipeline
2009-11-20 10:01:06 -05:00
62ce5fa462
For EXT-2623 - object missing wearables and attachments on initial login
...
--HG--
branch : avatar-pipeline
2009-11-19 16:00:40 -05:00
afbc78d039
Merging viewer-2-0 changes into avatar-pipeline branch
...
--HG--
branch : avatar-pipeline
2009-11-19 13:36:27 -05:00
6cea252986
merge
...
--HG--
branch : avatar-pipeline
2009-11-19 13:19:16 -05:00
d974ad3934
EXT-2562 : Somehow show cnotents of what I'm wearing
...
Added appearanceSP button to toggle folder closed/open state.
Also fixed up some bugs with current outfit title placement in appearanceSP.xml
Also added a generic call for getting the current outfit folder link
2009-11-19 12:06:26 -05:00
5dea0791f7
EXT-2581 : Old items still display as "(worn)" even after I change outfits
...
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
17a6848d2f
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
...
--HG--
branch : avatar-pipeline
2009-11-17 16:11:05 -05:00
6474dbd469
For DEV-34652: OUTFITS (Operations) : Wear folders via drag and drop - handle untyped folder dragged to outfit
...
--HG--
branch : avatar-pipeline
2009-11-17 16:07:29 -05:00
fed26cf76e
EXT-2568 : Reset Current Look string if wearing from non-outfit
...
If you wear a category, then the current look string on the appearance sidepanel gets set back to NULL.
--HG--
branch : avatar-pipeline
2009-11-17 15:00:25 -05:00
7202227953
Removed function that was only used for debugging. Defer object suicide until end of the method
...
--HG--
branch : avatar-pipeline
2009-11-17 13:43:12 -05:00
aebfdac65f
merge
...
--HG--
branch : avatar-pipeline
2009-11-17 13:06:01 -05:00
32dccaf3d8
Sidepanel Appearance refactoring. Work in progress.
...
1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance)
2. Changed some "Looks" names to "Outfits"
3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming)
4. Took out tab from sidepanel_appearance.
--HG--
branch : avatar-pipeline
2009-11-17 10:36:11 -05:00
9c823a1d40
Deferring work to idle time to avoid recursive notifyObservers calls - added wrapper class to defer an arbitrary boost::bind or other callable
...
--HG--
branch : avatar-pipeline
2009-11-17 10:33:47 -05:00
0ce8ce50d8
merge
...
--HG--
branch : avatar-pipeline
2009-11-13 17:48:11 -05:00
acdce23299
Header file cleanup
...
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
cc72b78b5f
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-11-13 16:49:36 -05:00
7a1e7dd69d
merge
...
--HG--
branch : avatar-pipeline
2009-11-13 16:21:11 -05:00
4b05dc4890
LLAppearanceManager cleanup - 2 methods renamed
...
--HG--
branch : avatar-pipeline
2009-11-13 15:20:54 -05:00
0fb0ce836d
EXT-2428 : Wearing a look should update the "Current Look" sidepanel string
...
Both double-clicking on an outfit to wear, and wearing an outfit from side panel, will now update the current look string.
--HG--
branch : avatar-pipeline
2009-11-13 14:42:28 -05:00
036b0b7d8d
removed dead code that was triggering a warning on some platforms
...
--HG--
branch : avatar-pipeline
2009-11-13 11:43:32 -05:00
56df94412b
LLAppearanceManager cleanup - removed dead code
...
--HG--
branch : avatar-pipeline
2009-11-12 17:20:53 -05:00
315af3fb82
LLAppearanceManager cleanup - no static at all
...
--HG--
branch : avatar-pipeline
2009-11-12 16:03:59 -05:00
0b104e2a41
LLAppearanceManager cleanup - turning into proper singleton
...
--HG--
branch : avatar-pipeline
2009-11-12 15:10:06 -05:00
4f3d32f5c7
Believe this fixes the remaining issues with missing attachment links on first use of 2.0 - EXT-1593 and EXT-1591.
2009-11-11 18:23:54 -05:00
115fb4e342
Removed some log file spam.
2009-11-09 17:26:37 -05:00
6f6d1314e6
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-05 08:33:31 -05:00
fa3b57bd9f
Merge the work lost in 49c9461937df back into the tree
2009-11-04 15:14:54 -08:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
98a24938b3
LLAppearanceManager::wearItem() - always check for extra links of same type, even if requested object is already linked.
2009-11-04 15:28:07 -05:00
ec8e27b8bf
Remove existing wearables of a type when putting on new ones. This will need to be revisited when we go to multi-wearables.
2009-11-04 13:14:57 -05:00
9109809fb1
For EXT-1591: Current Outfit Folder contains duplicate attachment items after relog.
...
--HG--
branch : avatar-pipeline
2009-11-03 12:22:31 -05:00
86b1ee7703
Work in progress on attachment tracking.
2009-11-02 14:10:56 -05:00
cc1c8bb9bc
EXT-1804: Operations on the current look do not enforce one wearable per type
...
DEV-39346: OUTFITS (Operations) : Restrict one shape per look, and some # of multiwearables per look
DEV-38436: OUTFITS : Guarantee every outfit has fully populated links to (one each of) all body parts.
Consolidated all paths for replacing or appending to COF, with common enforcement mechanism for counts of body parts, clothing, etc.
Several functions are no longer needed after these changes, will clean up in a later pass.
2009-10-29 11:19:45 -04:00
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
67c4555a37
svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
* Bugs: EXT-1779
2009-10-21 23:08:48 +00:00
850c0f1e33
Merge of latest avatar pipeline working branch into viewer2.0 branch.
...
Result of: (NO CONFLICTS)
svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
2009-10-16 20:11:51 +00:00
3bd6c1919c
Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.
...
svn merge -r 134766:135946 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-10-12 18:40:11 +00:00
6d887be589
Syncing latest appearance work from avatar pipeline into viewer2.0.
...
Result of: (NO CONFLICTS)
svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .
2009-09-29 23:09:41 +00:00
af774fc9db
For EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder and EXT-1090: Attachments detach on login.
...
This is still in short term fix territory - trying to avoid creating duplicate attachment links when wearing outfits. It's not 100% robust because of the possibility of race conditions.
2009-09-25 15:18:34 +00:00
7eca974a11
Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details.
2009-09-24 18:05:38 +00:00
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
James Cook