summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-01Fix for EXT-2892/DEV-43568 (if a face is set to show multiple texture ↵Monroe Linden
repeats, only one of the repeats is interactive) Added LLViewerMediaImpl::scaleTextureCoords() function to encapsulate the code that maps from texture coordinates to media coordinates. Made scaleTextureCoords() wrap the texture coordinate to the range [0.0, 1.0) before converting to media coordinates.
2009-12-01Fix for EXT-2836 (Changing texture on Media on a Prim face removes MoaP ↵Monroe Linden
functionality). LLVOVolume::regenFaces() (specifically the calls to facep->setTexture()) breaks associations between faces and LLViewerMediaTexture objects when called on a prim with playing media. This change adds code which recreates the associations.
2009-12-01Mergeskolb
2009-12-01Mergeskolb
2009-12-01mergeJames Cook
2009-12-01Fix Linux/Mac builds due to LLToolDragAndDrop member function pointersJames Cook
2009-12-01Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-01EXT-2719 - put on menu now gets disabled if the object is lockedEric M. Tulla (BigPapi)
2009-12-01Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-01Fix for "DEV-43581 - EXT-2901: [BSI] Can't access twitter pages directly via ↵callum
MoaP"
2009-12-01mergeJames Cook
2009-12-01mergeJames Cook
2009-12-01Merge - backing out scroll container changeJames Cook
2009-12-01Revert partial fix for EXT-2572 (chat history text clipping) that causes ↵James Cook
EXT-1597 (script editor scrolls upward while typing) Backed out changeset: e38642e0c21c
2009-12-01EXT-3015 Fixed right and center aligned text boxesJames Cook
Document rect left edge was being computed incorrectly. Made floater_test_textbox.xml have more examples of text. Reviewed with Kelly
2009-12-01Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-01Increased width of drop-downs in floater_tools.xmlJustin C. Rounds (Chuck)
Discovered bug: active drop-down missing art. Fixed in textures.xml. http://jira.secondlife.com/browse/EXT-2674
2009-12-01EXT-332: Hide international billing features until enabled.Lynx Linden
The international billing links and labels in the Buy L$ floater are now hidden by default. They will only be displayed once we get an estimate from the server that includes an "estimatedLocalCost" token, i.e., we are connected to a server that has the international billing functionality enabled. This is done so that the new functionality in Viewer 2.0 is not exposed to the user until the international billing features are live (which is scheduled to happen after the Viewer 2.0 release date).
2009-12-01automated merge for viewer-2.0 -> avp.Loren Shih
--HG-- branch : avatar-pipeline
2009-12-01Automated merge for avatar-pipeline pullLoren Shih
--HG-- branch : avatar-pipeline
2009-12-01EXT-2964 : Can drag-and-drop a folder with links onto an objectLoren Shih
EXT-3012 : Cleanup LLToolDragAndDrop Now checking if folder contents have links before allowing object drop. Did some superficial cleanup of lltooldraganddrop files. --HG-- branch : avatar-pipeline
2009-12-01EXT-2922 : 2nd inventroy shouldn't list "New Window" as an option, since it ↵Loren Shih
silently fails Fixed the behavior so that New Window brings up a new floater inventory window instead of doing nothing. --HG-- branch : avatar-pipeline
2009-12-01Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-01Increased height on object content inventory panel.Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-2906
2009-12-01line ending fixesBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-01mergeJames Cook
2009-12-01merge.Tofu Linden
2009-12-01Merge the major new voice SDK version from Vivox ('mossbuild1')Tofu Linden
2009-12-01Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-01Changed UISpinctrlBtnHeight to match art.Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-1621 http://jira.secondlife.com/browse/EXT-1669 http://jira.secondlife.com/browse/EXT-1671
2009-12-01mergeLynx Linden
2009-12-01EXT-2765: Added help IDs for tabs in the Places sidebar.Lynx Linden
The issue was that the widgets for this panel are not built solely from XUI. There's code in LLPanelPlaces::changeInventory() that creates the actual My Inventory and Teleport History panels. Adding help_topic strings to the relevant XUI files for the LLLandmarksPanel and LLTeleportHistoryPanel classes fixes this issue.
2009-12-01version number tweakery in About dialog.Tofu Linden
vivox 'Unknown' is the more-descriptive '(Not Connected)' now. plus, we admit that our Qt version number is hard-coded right into the viewer instead of asking Qt.
2009-12-01DEV-41358: pass localization information to the Search web pages via aLynx Linden
new ?lang=<LANG> query parameter.
2009-12-01DEV-40702: Internationalize the unknown Vivox version string ratherLynx Linden
than hardcode it in llvoiceclient.cpp. Also rename the string from "Unknown" to "Not connected", to better reflect the fact that we get the Vivox version once voice is connected.
2009-11-30Merge from product-engineSteve Bennetts
2009-11-30Simple fix for Hg merge tool shittiness..callum
2009-11-30mergeJames Cook
2009-11-30Clean up test XMLJames Cook
2009-11-30Bump ParabuildJames Cook
2009-11-30Merge with tipcallum
2009-11-30Fix for DEV-41951 - reworking of whitelist so it's more usable.callum
2009-11-30arrow_up and arrow_down were removed from textures at some point. I put them ↵Lis Pardi
back so that the arrows in panel_preferences_alerts look right.
2009-11-30Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-11-30Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/Rick Pasetto
2009-11-30ext-2880 'My Balance" btn overlaps the 'Time' indicatorLis Pardi
2009-11-30Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-30DEV-43041 DEV-41648 - disable OK and Apply if the media data is the same as ↵Rick Pasetto
the initial Review #48 This change kills two birds with one stone: every frame, we check to see if the media data is the same as the one we 'initialize' with. If it is, we disable OK and Cancel. Otherwise we enable them. This makes it very difficult to set empty media data, as well as fixing the "apply button doesn't grey out" bug.
2009-11-30EXT-2769 EXT-2770 alpha masks not working properlyNyx (Neal Orman)
Eyes weren't alpha masked. Hair wasn't being consistently alpha masked Hair alpha mask was being ignored during avatar customization We weren't hitting onFirstTEMessageReceived() All of these were fixed. Also takes care of EXT-2926 EXT-2925 EXT-2974 Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-11-30De-inlined some UI param block definitions.James Cook