summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-03local mergeskolb
2009-12-03Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TESTNat Goodspeed
2009-12-03Reconcile llsdutil_tut.cpp with Kent's LLSD API changeNat Goodspeed
2009-12-03mergebea@american.lindenlab.com
2009-12-03mergebea@american.lindenlab.com
2009-12-03Add Doxygen commentsbea@american.lindenlab.com
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-02local mergeskolb
2009-12-02removed the unused AutoPlayMedia flag. This is now governed by the ↵skolb
ParcelMediaAutoPlayEnable flag.
2009-12-02unify the two media auto play preferences into one. The ↵skolb
ParcelMediaAutoPlayEnable flag now controls both (horribly named, but must be preserved for legacy purposes).
2009-12-02Changed the behavior of LLViewerMediaImpl::setDisabled() to interact more ↵Monroe Linden
predictably with auto-play. Disabling and re-enabling media should work much more like teleporting away and teleporting back -- media will respect the auto-play flag when reloading, instead of returning to its previous load state.
2009-12-02Cleaned up the conditional code a bit in llviewerkeyboard.cpp, start_gestureskolb
2009-12-02DEV-42150 crash when using media on a HUDskolb
2009-12-02Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-02Minor changes from review feedbackRick Pasetto
get rid of thunk function
2009-12-02Merge viewer 2.0 into media branchskolb
2009-12-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-02EXT-2737 Fix for terrain/avatars/trees not showing up in water reflection.Runitai
2009-12-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-01Fix a signed/unsigned warning that breaks the Windows build.callum
2009-12-01mergebea@american.lindenlab.com
2009-12-01Add Doxygen commentsbea@american.lindenlab.com
2009-12-01Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-01Partial fix for EXT-2904/DEV-43584 (Space bar and Enter/Return key don't ↵Monroe Linden
work as input for checkboxes or buttons on MoaP). This change forces space characters to go through the keyEvent() path instead of the unicodeInput() path, which makes the space bar work for setting checkboxes. I still need to figure out what's going on with the enter key.
2009-12-01Mergeskolb
2009-12-01EXT-3033 Streaming audio is completely broken in Viewer 2.0skolb
2009-12-01DEV-43622 : API change (no functionality change) to fix a design error in LLSDKent Quirk
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01EXT-2117 - Fix for not being able to add / remove multiple items of ↵Eric M. Tulla (BigPapi)
different types from your inventory
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-01DEV-43612 (part1) fix a typo in UI text from llmaniptranslateRamzi Linden
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-01DEV-42989: Adjust media priority based on app minimization and focusRick Pasetto
Review #49 This change adjusts each media's priority based on whether the viewer is minimized (media priority becomes HIDDEN) or unfocused (media priority becomes LOW). However, due to the fact that updateMedia() was no longer being called when minimized, I moved its call out of LLViewerTextureList::updateImages() (a seemingly odd place anyway) and into its own idle callback.
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