summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
AgeCommit message (Expand)Author
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-20Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallumRick Pasetto
2010-01-20Add another setting controlling whether SLURL drag-and-drop performs a teleportRick Pasetto
2010-01-19Fix for EXT-4191 - Drag and Drop viewer resolves some slurls to "//"Callum Prentice
2010-01-19mergeYchebotarev ProductEngine
2010-01-18Some trivial comment/logging typos that were bothering me more than they need...Tofu Linden
2010-01-18Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-18work on EXT-4322 Remove the Communicate floaterYchebotarev ProductEngine
2010-01-14Backed out changeset f34a69c2af56Tofu Linden
2010-01-14Backed out changeset d5b761982e63Tofu Linden
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
2010-01-11Merge with tipCallum Prentice
2010-01-11Fix that stops "Start Location" corruption if you drag an invalid http://slur...Callum Prentice
2010-01-11Fix unposted bug: drag feedback didn't check whitelistRick Pasetto
2010-01-11EXT-4077 Clicking motd link opens two web browser windowsLeyla Farazha
2010-01-07Fix drag and drop for windows. Makes Win32 state machine behave more like Mac.Callum Prentice
2010-01-07Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-07Merge latest fixes from viewer2.Tofu Linden
2010-01-06EXT-3878 - Menus disappear when UI Size is < 1.00richard
2010-01-05Build fix: add missing #includeRick Pasetto
2010-01-05Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
2009-12-31EXT-3778 Fixed handling of url passed in on cmd line.Mark Palange (Mani)
2009-12-18Fix slurl crashing, fix slurls highlighting objects, fix overlapping objects ...Rick Pasetto
2009-12-18Fix crash when DnD onto an item with media but no implRick Pasetto
2009-12-18Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-16Don't allow drag if the cap URL is empty or if the whitelist does not passRick Pasetto
2009-12-16MergeJames Cook
2009-12-15EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time optionsLeyla Farazha
2009-12-15mergeRick Pasetto
2009-12-15Merge from default branch.Vadim Savchuk
2009-12-14Final merge of precompiled header dependency cleanup work.brad kittenbrink
2009-12-13Fix Mac buildJames Cook
2009-12-11Fixed normal bug EXT-2724 (Mini map mimimizes underneath Nav bar when Favorit...Andrew Dyukov
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
2009-12-10EXT-1994 - Entering text into the Chat Bar sometimes slows to about 2 cpsrichard
2009-12-07Merge of viewer 2 changesPalmer
2009-12-03Added the LLWindowCallbacks::DragNDropAction enum, and made the mac implement...Monroe Linden
2009-12-03Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-03Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallumRick Pasetto
2009-12-03Change API to no longer include slurl argument (its a platform-agnostic polic...Rick Pasetto
2009-12-03Merge of include dependency cleanup work with viewer-2-0brad kittenbrink
2009-12-01Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-01DEV-42989: Adjust media priority based on app minimization and focusRick Pasetto
2009-11-30Add support for dropping a region SLURL on login page and populating the UIcallum
2009-11-30mergeRick Pasetto
2009-11-25created container for LLFloaterView for future z-swapping with sidetrayrichard
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in llviewermessages...James Cook
2009-11-25mergeRick Pasetto