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
1147cb1afb
Automated merge from trunk
2010-03-01 18:09:04 -08:00
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
9b05fecbf6
automated merge from trunk
2010-02-25 18:24:07 -08:00
c6163fafaa
automated merge
2010-02-25 01:34:52 -08: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
ed351ca913
For DEV-37955 : Broken links possible if linked item is cached but baseobj not cached
...
Major fix to guarantee no broken links. If a link comes through from the cache but its baseobj doesn't also exist in the cache, then don't add the link to memory yet, and uncache the folder.
Reviewed by: Nyx, Vir.
2009-08-13 16:05:07 +00:00
7bbc5cdea6
svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification
This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-08-12 19:03:20 +00:00
85f9400927
EXT-316 Enable the Viewer to generate calling cards for any agent
...
Added code to store agent ID in the description field of calling cards so that we can use them to store user generated contacts.
Currently enabled as a context menu for avatars (just for initial testing).
reviewed by richard
2009-08-05 01:05:39 +00:00
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
db5cda2667
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
...
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
2009-08-03 22:25:48 +00:00
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
7ab41a8a81
transplant with 2517, also fix single username login issue
2010-02-05 15:59:14 -08:00
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
a00af78b95
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24 21:36:42 +00:00
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
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
80f6196327
QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release
...
Related Jiras:
1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id
2. DEV-17937 null asset id not handled correctly in ais inventory fetch
3. OPSRT-1097 Update python-indra package on the system images
4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log.
5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim
6. DEV-20335 QAR-751 AIS bans are missing from message.xml
svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .
Miscellaneous commit:
1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port
2008-09-16 18:12:32 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
b5936a4b1d
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
...
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
2fdd7c35f3
svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
...
Merge patches from 1.19.1 Server branch:
* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY). Web service version of this, must use two named queries because we need to change the query based on input string length.
2008-02-28 18:15:01 +00:00
d06e5e3519
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
...
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
d373dcc7cb
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
...
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
029130bf9c
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-23 21:17:34 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
7dada07dba
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-20 22:02:36 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
ad94bca0d2
merge -r 56696:57082 Branch_1-13-2
2007-01-24 20:21:23 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Vadim Savchuk