summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-08-31Updated Me Profile and Me Edit Profile xml files to match new spec generated ↵Kurt Stauffacher
by 80/20. Description of task in EXT-770
2009-08-31svn merge -r130875:131962 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31Standardized layouts, changed commitment model labels to ok/cancel, ↵Erica Olsen
modernized advanced floaters.
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> ↵Steven Bennetts
viewer-2.0.0-3 Includes: * DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips * DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor * Some cleanup to llerror so that it doesn't depend on llfixedbuffer * A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
2009-08-29EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted ↵Steven Bennetts
menu_minimap.xml (translations all have menu_mini_map.xml)
2009-08-29EXT-614 Object inventory does not update to show inventory created or placed ↵Steven Bennetts
in the object. Reviewed by: Seraph
2009-08-29svn merge -r 132139:132140 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5 In the webkit plugin, don't try to load web browser plugins except on Windows. The flash plugin on the Mac crashes the webkit plugin when running under xcode.
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
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-28svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3 * EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
2009-08-28Updated eol properties on .xml filesSteven Bennetts
Added test_apps to ignore list
2009-08-28DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.Nat Goodspeed
LL_ADD_INTEGRATION_TEST supports tests that may require linking against one or more Linden libraries, or that should be executed with a wrapper script. Use this to test lllazy.cpp, llsdmessage.cpp and llcapabilitylistener.cpp.
2009-08-28skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on ↵James Cook
script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout. CHANGES: minor layout change: "start location" and "remember password" weren't on the same horizontal line. DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization. forgot to check this in earlier...fixes off-by-one crash when editing a script DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...' VIEWER-SIDE text change. This does not change the actual message coming from the server EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed Changes to notifications.xml text to fit Style Guide and some renamed menu items EXT-147 Ongoing revisions to new gestures layout. DEV-35097 catch more instances of 'SLURL' and make them 'SLurl' Removed Info Displays and Buy Currency Test from top menus. Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots. De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow. Commented about use of childSetCommitCallback(). De-inlined LocalizedString paramblock constructor. eliminated memory leak I18N: more things are missing a name= parameter, breaks localization. EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights. fix for llmessage_test crash in Windows Release builds DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules DEV-36809 Click target for slider handles is too small -- reviewed by steve EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard DEV-35938 Horizontal scroll thumb too high -- to be reviewed EXT-386 clean up warnings - initCommitCallback... Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp. Reviewed with Leyla. Login menu > Debug > Avatar Inspector shows test avatar inspector. Also added to main menu > Debug > XUI > Avatar Inspector. Changed text/layout of dummy inspector. Not reviewed. Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
2009-08-28DEV-38942 Eliminate startModal() from LLModalDialogSteven Bennetts
Also moved TOS and Critical floaters to login debug menu for testing
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-26EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPositionSteven Bennetts
2009-08-26svn merge ↵Steven Bennetts
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-26DEV-37428 - add adult_compliant flag to startup sequence so that 2.x viewer ↵Kent Quirk
properly identifies itself as capable of handling the adult information.
2009-08-24attempt at fix for windows build errorRichard Nelson
reviewed by James
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24Some linux updater warning fixes for fussy futuristic gcc versions!Adam Moss
2009-08-21svn merge -r130238:130240 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6 QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-08-20Applied path from "[sldev-commits] r2604 - ↵Christian Goetze
projects/2009/snowglobe/trunk/indra/newview"
2009-08-20EXT-580 Add Friend button in the IM floater not disabled if already friendsLeyla Farazha
EXT-579 Add Friend from the Im floater opens multiple invitation dialogs sidebar should be up above bottom tray reviewed by richard
2009-08-19EXT-592 IM chat is not updated for the first text message. PE added ↵James Cook
LLIMFloater::toggle() to show and hide the IM window when chiclets were clicked. This was not invoking the custom logic in LLIMFloater::show() that causes the message list to update. Reviewed with Leyla.
2009-08-19EXT-591 Create an Object (Build tool) will crash viewerSteven Bennetts
EXT-599 Time of the sent messages is '00-00' in the Group chat EXT-598 Acquired/created date for all landmarks is 01/01/1970
2009-08-18DEV-38250 Remove temporary preferences tab and organize advanced optionsErica Olsen
2009-08-18For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make ↵Bradley Payne
sure that only wearables from the COF are handled as wearables during initial COF load. Added error checking for null asset IDs. This fixes a crash on login observed after loading from COF was enabled.
2009-08-18DEV-38131 "Drop down boxes with text entry ignore the text in the entry field"Richard Nelson
reviewed by James
2009-08-18Dev-36747Palmer Truelson
bump down 9700M and add new nvidia cards no code changed
2009-08-18merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3 EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
2009-08-18svn merge -r130469:130817 ↵Loren Shih
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-18EXT-549 Viewer crash when attempting to close detatched top menu. ↵James Cook
LLTearOffMenu wasn't registering its closeTearOff method because postBuild() isn't called because it isn't built from XML. Moving registration of closeTearOff to the constructor fixes it. Discussed with Steve, but not reviewed formally.
2009-08-18EXT-495 IM windows don't autoscroll. Added track_bottom param to ↵James Cook
floater_im_session.xml text editor, as I believe there is an implicit reshape happening in the dialog. Also made the divider lines showing usernames for each IM suppress duplicates, more like local chat history. Reviewed with Leyla.
2009-08-18EXT-547 Loosing focus on an IM window looses typed entriesLeyla Farazha
and a fix for undocked im windows not closing when we open another im window reviewed by james
2009-08-17EXT-519 Moving the cursor over a modal dialog dings every timeLeyla Farazha
EXT-471 Usernames do'g appear in the communicate window reviewed by steve
2009-08-17merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1351 https://svn.aws.productengine.com/secondlife/pe/stable-1@1365 -> viewer-2.0.0-3 EXT 451 EXT-303 EXT-367 EXT-367 EXT-371 EXT-394 EXT-494 EXT-502 EXT-503 EXT-516 EXT-538 EXT-540
2009-08-17Reverted accidental experimental change from last checkin.Steven Bennetts
2009-08-17Significant optimization to LLUIString.Steven Bennetts
2009-08-15EXT-490 Voice device settings unsavedSteven Bennetts
EXT-466 Statistics window is empty EXT-488 Minimap does not open
2009-08-14merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 ↵Steven Bennetts
-> viewer-2.0.0-3 EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
2009-08-14svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3 EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
2009-08-14* Added a few safety checks to LLScrollContainerSteven Bennetts
* Minor change to LLIMView so that IM windows don't get hidden after they are displayed * Changed default action for avatar list to be IM as per spec * Fixed merge of home tab from avatar code.
2009-08-13Tiny change to add a temporary keyboard shortcut for Active SpeakersSteven Bennetts
2009-08-13For DEV-37955 : Broken links possible if linked item is cached but baseobj ↵Loren Shih
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-13More merge fixes (side panel merge issue)Steven Bennetts
2009-08-13Skinning merge fix plus missed files.Steven Bennetts
2009-08-13merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3Steven Bennetts
* EXT-449 EXT-131 EXT-464 * People and Places panel layout changes * Some I18N fixes, test language * Updated group panels following proposed new design * made ims easier to read by color coding
2009-08-13For DEV-37907 : Goto item should scroll inventory view to baseobjLoren Shih
Simple fix to scroll the inventory panel to show a folder if you select "Goto Link" from a folder link.
2009-08-12reverting changes from 130124 - suspected cause of Mac crashes during login.Steven Bennetts
2009-08-12For DEV-37895 : New icons for outfit foldersLoren Shih
Icons existed already, but they were not added to textures.xml.