summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2009-10-19Fix for a case where the webkit plugin never generates a LOCATION_CHANGED ↵Monroe Linden
event at all.
2009-10-19mergeSteve Bennetts
2009-10-19Compress logging of media data (but still have it)Rick Pasetto
2009-10-19EXT-1685 Pull shared inspector code into llinspect.h/cpp.James Cook
Reviewed with Leyla.
2009-10-19Edit tool_tips for uniform capitalization and punctuationLisabeth Pardi
EXT-1675
2009-10-19Remove "add" inventory operation and rename MAX_WEARABLES_PER_TYPENeal Orman
This patch removes the invalid "add" operation shown on wearables in inventory It also renames MAX_WEARABLES_PER_TYPE, resets the value to 1 (non-multi-wearables), and adds a weak check to enforce one wearable per type. Code reviewed by Vir
2009-10-19mergeSteve Bennetts
2009-10-19Needed to revert a change I had made earlier for another JIRA. ↵Justin Rounds
https://jira.secondlife.com/browse/EXT-1672
2009-10-19Fix from last merge.Steve Bennetts
2009-10-19EXT-1664 bugfix for male avatars have female bodiesNeal Orman
Found a couple bugs in the code relating to cross-wearable visual param linking. Fixed with this patch - cross-wearable and inter-wearable visual params should now link properly for both wearable-owned and avatar-owned parameters. Code reviewed by Seraph
2009-10-19EXT-1668 Change topmenu "My Account" to "My Dashboard", move Beacons into ↵Erica Olsen
World > Show
2009-10-19mergeSteve Bennetts
2009-10-19DEV-41358: Remove the code for the old search interface.Martin Reddy
This checkin deletes all of the code associated with the old XUI-based search interface, including LLFloaterDirectory, LLPanelDir*, a global variable event hack, and the associated XUI file. The new web-based search interface, LLFloaterSearch, is the way of the future. Deleted 19 files and 5,838 lines of code.
2009-10-19DEV-41359: Added a new web-based Search floater, LLFloaterSearch.Martin Reddy
This new Search floater replaces the current XUI-based search interface with one that is implemented entirely as a web service. This is currently pointing toward a temporary search URL. The URL will be updated when the stable version is available.
2009-10-19make callbacks for media hud control data driven, add whitelist indicator , ↵angela@angelas-macbook-pro.local
add secure browsing indicator
2009-10-19EXT-332 DEV-40744: Local currency updates for Buy L$ floater.Martin Reddy
Added links to the Buy L$ floater to access payment method, local currency settings, and exchange rate. Also included required text about re-entering value in order to update exhance rate. And added a notification on successful payment, as some foreign currency transactions can take up to 20 mins to complete. Worked with Ram on Erica on the design. The actual text may need some tweaking once we hear back from Gisland. The URLs are placeholder for now.
2009-10-19Merging revisions 2070-2084 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241 * Dev: EXT-1271 EXT-1601 EXT-1154
2009-10-19Merging revisions 2046-2068 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes
2009-10-18Merging revisions 2036-2042 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bug Fixes: EXT-1542 EXT-1540 EXT-1529 EXT-1539
2009-10-17Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-10-17DEV-40930: Introduce LLAppViewerListener "forceQuit" operation.Nat Goodspeed
The bug was driven by the following sequence in llstartup.cpp: if(reason_response == "update" || reason_response == "optional") { // used to resend status event still containing "update", // erroneously instantiating a second forced-update // LLAlertDialog LLLoginInstance::getInstance()->disconnect(); // quit with an LLAlertDialog still on sModalStack used // to result in LL_ERRS LLAppViewer::instance()->forceQuit(); } I hope to be able to introduce a test script to verify the fix. That script would need to be able to call LLAppViewer::forceQuit() rather than requestQuit(), which is already available via LLAppViewerListener. At the same time, changed LLAppViewerListener to bind a functor to retrieve an LLAppViewer instance (namely LLAppViewer::instance) rather than an LLAppViewer*. Apparently the static instantiation of LLAppViewerListener was calling LLAppViewer::instance() too early, before things were ready, so the declaration was changed to pass NULL -- then in each method, call LLAppViewer::instance() if the bound pointer is NULL. Binding the LLAppViewer* is a Feathers tactic intended to avoid the need to reference the singleton. Binding a functor still leaves it up to the instantiating code to reference LLAppViewer::instance, while deferring the actual call to that method.
2009-10-17EXT-606 lag-o-meter text visibility and placement issuesJiao Li
2009-10-16mergeMark Palange (Mani)
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16Group inspectors now work. They are hooked up to About Land, build tools ↵James Cook
floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla.
2009-10-16EXT-1637 Clean up build tools > texture > mediaErica Olsen
Replaced temp group activate checkbox tga with png
2009-10-16svn merge -r134817:136516 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-32867 : Avatar Pipeline Project - Multi-Attachments This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly. Reviewed by: Vir.
2009-10-16EXT-770 Update Me Profile and Me Edit Profile to match updated style guideErica Olsen
EXT-805 Update Me Pick Info and Me Edit Pick Info to match updated style guide
2009-10-16Merge of latest avatar pipeline working branch into viewer2.0 branch.Eric Tulla
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-16Changing declaration of static constant member variables to match exact ↵Neal Orman
required format. Windows and Linux glossed over this issue, but mac was more picky. Fix code reviewed by Bigpapi.
2009-10-16merging in new wearable infrastructure to get a step closer to eventually ↵Neal Orman
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-16FIX windows build: no automatic conversoin between LLVector3 and LLVector3d??Rick Pasetto
2009-10-16Re-colored graphic as temporary fix to address ↵Justin Rounds
http://jira.secondlife.com/browse/EXT-1486
2009-10-15Fix for another "case not handled in switch" due to the addition of ↵Monroe Linden
MEDIA_EVENT_NAME_CHANGED.
2009-10-15Fix for a "case not handled in switch" due to the addition of ↵Monroe Linden
MEDIA_EVENT_NAME_CHANGED.
2009-10-15Major refactor of LLViewerMediaFocus and LLPanelMediaHUD.Monroe Linden
LLViewerMediaFocus now tracks two separate objects: the currently focused media object, and the media object that's currently being hovered over. It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away. This will prevent it from keeping objects from being deleted. The poorly-understood "mouseOverFlag" has been expunged. LLViewerMediaFocus no longer uses LLSelectMgr at all. The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager. LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly. LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD. I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions. The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
2009-10-15Merge from branch-test (EXT-651)Steve Bennetts
2009-10-15EXT-651 - Added Upload Image shortcut to Advanced > Keyboard Shortcuts. Also ↵Steve Bennetts
cleaned up that menu a little. --HG-- branch : branch-test
2009-10-15Merge from remote repoRick Pasetto
2009-10-15Merge from remote repoRick Pasetto
2009-10-15Clarify comments a littleRick Pasetto
2009-10-16DEV-41389 Localize the splash screen 'loading...' icon in all languagesRamzi Ramey
* added files should already be covered in viewer_manifest.py * Also fix a 1-line typo in Italian installer.
2009-10-16EXT-1561 Update People Profiles to match Style guideErica Olsen
EXT-770 Update Me Profile and Me Edit Profile to match updated style guide EXT-302 Update and My Account links in the Me Panel are misplaced EXT-805 Update Me Pick Info and Me Edit Edit Pick Info to match updated style guide
2009-10-15FIX DEV-39513: Tweak target camera position to avoid a flip when target ↵Rick Pasetto
normal is vertical Review #21 This attempts to tweak the target camera position slightly towards where the camera started from, so as to avoid the flip noted in this JIRA.
2009-10-15Merge to update new version number.callum
2009-10-15Fixed search button icon to match spec. ↵Justin Rounds
http://jira.secondlife.com/browse/EXT-1320
2009-10-15Set scale_image to false in combo_box.xml to fix stretching. ↵Justin Rounds
http://jira.secondlife.com/browse/EXT-1319
2009-10-15Fixed defect for URLs that already have a schemecallum
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=18
2009-10-15Merge from branch-test (EXT-1279)Steve Bennetts
2009-10-15EXT-1279 Crash if font file not found.Steve Bennetts
Added getFontDefault() to llfontgl.h --HG-- branch : branch-test