8a7ca61479
Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
...
-- cleanup: removed deprecated code added for previous sollution to support custom sorting of favorite landmarks.
For now previous implementation is removed, bug is FIXED.
--HG--
branch : product-engine
2010-01-29 13:05:11 +02:00
4666636cdc
Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
...
-- improvements: for now sort indexes are cleaned & saved only if something was changed amont them.
--HG--
branch : product-engine
2010-01-29 12:34:23 +02:00
72b2cf291d
Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
...
-- implemented cleanning of stored sort indexes to remove ones for landmarks not in Favorites while disconnecting viewer
--HG--
branch : product-engine
2010-01-29 12:25:38 +02:00
b80cd22704
Work on major bug EXT-3985 ([BSI] Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x)
...
-- removed using of the LM Prefix while renaming Inventori item
--HG--
branch : product-engine
2010-01-28 09:50:06 +02: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
97f35b18f0
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-18 14:51:26 +02: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
4d3421fe1b
EXT-4462: Support secondlife:///app/inventory/show
...
Opens the user's inventory in the side panel.
2010-01-18 10:16:55 +00:00
c3c0b5ed47
Fixed normal bug EXT-4312 (Landmark occupy random location in the 'Favorites Bar' accordion if drag-and-drop it)
...
-- added LLInventoryCallback to rearrange favorite landmarks properly after new on is added.
--HG--
branch : product-engine
2010-01-15 20:18:22 +02:00
e303864c17
Merge from default branch.
...
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
aad8d99af2
automated merge viewer2.0->viewer2.0
2009-12-14 10:39:59 -05:00
3e75137f26
EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.
...
Background fetches track whether they're being done on MyInventory, Library, or both.
Also did some cosmetic header file cleanup.
2009-12-11 18:13:54 -05:00
a3ee1dda20
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-11 16:31:36 +02:00
4fc7b91a79
implemented EXT-2323 “Get rid from obsolete notification widgets”;
...
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
9db47b1d4b
Fix for EXT-3368 - "Save Texture" functionality was no longer respecting perms
2009-12-10 16:07:54 -05:00
cb88b7f4a4
merge
...
--HG--
branch : avatar-pipeline
2009-12-08 22:15:17 -05:00
7ce4958688
Fix for unable to create alpha masks and tattoos in inventory menus
...
--HG--
branch : avatar-pipeline
2009-12-08 13:47:59 -05:00
0b4b03fe3e
Merge from product-engine
2009-12-07 15:57:31 -08:00
ff7f3c348d
EXT-3124 : Add lookup for finding all linked items to an item
...
Commented this feature out since the viewer can't ask the server to change assetIDs of its inventory items.
--HG--
branch : avatar-pipeline
2009-12-07 13:06:24 -05:00
da8de2b674
implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
...
Changes:
1.highlighting of landmarks was broken by LLInventoryPanel::getActiveInventoryPanel().
2. escaping of urls
--HG--
branch : product-engine
2009-12-07 19:42:11 +02:00
13f1ed2740
EXT-3124 : Add lookup for finding all linked items to an item
...
EXT-3195 : Regenerat Links sometimes pairs to library items
Excluding library when repairing broken links.
Reselecting original selected broken link after repairing.
--HG--
branch : avatar-pipeline
2009-12-07 11:43:24 -05:00
23068a2e7d
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-04 20:09:20 -05:00
add459cfd2
EXT-3179 : Add ability to recover broken links
...
EXT-3168 : Add "Find Original" to InventoryPanel gear menu
Broken link recovery is still work in progress.
--HG--
branch : avatar-pipeline
2009-12-04 20:07:09 -05:00
5c01958391
For EXT-2879: uncommented web-based inventory fetch. AIS fix is in process.
...
--HG--
branch : avatar-pipeline
2009-12-04 18:55:23 -05:00
b05ebd8977
merge of viewer2 into avp branch
...
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
4916305ce1
EXT-3029 : Missing icons for broken item link / broken folder link
...
EXT-3024 : Broken links don't show up in inventory
Mocked up some link icons for broken links. These need to be polished up.
Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory.
--HG--
branch : avatar-pipeline
2009-12-01 18:57:15 -05:00
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
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
88a56949d5
made task inventory offers work the old way, and disabled inv slurls for them.
2009-11-24 15:43:29 -05:00
2bdf430de1
small fixes for inv slurl functionality
2009-11-23 19:59:47 -05:00
9eb42546dc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-23 11:55:33 -05:00
8580f840f3
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 19:28:48 -05:00
a3930c7ff7
Inventory Offer changes and clickable inventory slurls
2009-11-20 19:27:33 -05:00
9b9c11778c
fixed minor bug EXT-1615 Landmark name is truncated before @ character after placing landmark on Favorites Bar
...
--HG--
branch : product-engine
2009-11-19 19:51:47 +02:00
9a30cde27b
EXT-2580 : Regression: Links are no longer PERM_NONE
...
For some reason, we started using the baseobj's permissions instead of the link's permissions at some point. Reverting it back to using the link's permissions.
2009-11-17 18:55:01 -05:00
176f29106d
Workaround for major bug EXT-2879 - Only 'Online' accordion is present in the People panel / Friends tab.
...
--HG--
branch : product-engine
2009-12-01 16:16:21 +02:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -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
e931d2d6f1
IM refac.: replaced passing copies by passing references, moved some IMModel private, added documentation
...
--HG--
branch : product-engine
2009-10-26 17:33:28 +02: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
c7786aa5b6
Merging revisions 2146-2150 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
...
* Bugs: EXT-1752 EXT-1754
2009-10-22 00:25:11 +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
d08b0b6ae8
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
...
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
2009-10-16 17:56:30 +00:00
276e80ce36
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1967 https://svn.aws.productengine.com/secondlife/pe/stable-2@1971 -> viewer-2.0.0-3
...
* Bugs: EXT-1431 EXT-1237 EXT-1151 EXT-1165 EXT-1410 EXT-1419
* Dev: EXT-1232
2009-10-12 08:20:00 +00:00
053b14a97a
Fix error with message template incompatibility for LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805.
...
Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
2009-09-17 16:53:36 +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
79653dfed4
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
...
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +00:00
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
ac1b723fd7
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
This merges in all appearance side panel bug fixes.
2009-08-18 15:34:09 +00:00
Mike Antipov