summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
AgeCommit message (Collapse)Author
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-374Tofu Linden
Checker: UNINIT_CTOR Function: LLPickInfo::LLPickInfo(const LLCoordGL &, unsigned int, int, int, void (*)(const LLPickInfo&)) File: /indra/newview/llviewerwindow.cpp remove some fat, dead members.
2010-01-27CID-26Tofu Linden
Checker: CTOR_DTOR_LEAK Function: LLViewerWindow::LLViewerWindow(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, int, int, int, int, int, int) File: /indra/newview/llviewerwindow.cpp
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-19mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-18Some trivial comment/logging typos that were bothering me more than they ↵Tofu Linden
needed to.
2010-01-18work on EXT-4322 Remove the Communicate floaterYchebotarev ProductEngine
leave some LLFloaterChat usages commented for later review... --HG-- branch : product-engine
2010-01-14Backed out changeset f34a69c2af56Tofu Linden
(this backs-out my backout, now that I'm happy the original merge works okay :))
2010-01-14Backed out changeset d5b761982e63Tofu Linden
This got pushed too early - sorry. Sigh.
2010-01-14Merge from viewer2, including fix for the test failure biting qarl.Tofu Linden
Minor conflict in llviewerfloaterreg.cpp resolved.
2010-01-11EXT-4077 Clicking motd link opens two web browser windowsLeyla Farazha
Fixed click handling weirdness. On mouse up, mTopCtrl was being passed the mouse click, and then again the mRootView regardless of whether the first handled it. Also if mRootView didn't handle a mouse up, it was traversed again to handle the mouse up. reviewed by Richard
2010-01-07Merge latest fixes from viewer2.Tofu Linden
2010-01-06EXT-3878 - Menus disappear when UI Size is < 1.00richard
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat EXT-3877 - Pinning two levels of menus prevents movement using arrow keys EXT-1303 - Hyperlink text wraps in the middle of a word reviewed by James
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-31EXT-3778 Fixed handling of url passed in on cmd line.Mark Palange (Mani)
The url from the cmd line was being overridden by the LoginLocation setting. (my bad!) Removed unnecessary llurlsimstring.h includes.
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-16MergeJames Cook
2009-12-15EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time optionsLeyla Farazha
EXT-2649 [BSI] Confirm on Drop EXT-3416 Can't name a new gesture on creation (and renaming is HARD) reviewed by James
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
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 ↵Andrew Dyukov
Favorites bar has been hidden) and partially fixed EXT-2742 (Invalid menu appearance after hiding navigation bar and/or favorites bar). Problem in fixed part of EXT-2742 was the same as the one which caused EXT-2724. --HG-- branch : product-engine
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
--HG-- branch : product-engine
2009-12-10EXT-1994 - Entering text into the Chat Bar sometimes slows to about 2 cpsrichard
EXT-2176 - Avatar movements seem to be transmitted after the release of a movement control reviewed by James
2009-12-07Merge of viewer 2 changesPalmer
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
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-11-25created container for LLFloaterView for future z-swapping with sidetrayrichard
floaters can now overlap sidetray fixed text selection background color to be inverse of text fg color EXT-2713 Script editor automatically scrolls to the top of script text when text is longer than the window. reviewed by James
2009-11-25merge in changes from viewer-2-0, manually fixed conflict in ↵James Cook
llviewermessages.cpp
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24MergeDave Parks
2009-11-24Fix for stalls when resizing screen texture.Dave Parks
2009-11-24Merge from product-engineSteve Bennetts
2009-11-24fixed EXT-2684 "Notification toasts position is incorrect"Alexei Arabadji
--HG-- branch : product-engine
2009-11-23EXT-2460 - mouselook mode - remove unused UI elementsrichard
EXT-2504 - black bars present at top and bottom when in mouselook reviewed by Leyla
2009-11-18mergeJames Cook
2009-11-17mergeSteve Bennetts
2009-11-17mergerichard
2009-11-17Merge of latest viewer 2 changesPalmer
2009-11-17Merge from product-engineSteve Bennetts
2009-11-16Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0James Cook
2009-11-16EXT-2110 - Help -> Abuse Report produces noticeable 3-10 second hangSteve Bennetts
Only happens with small windows because of some code that does font resizing on high res. Changed the scale factor threshold to cover vast majority of cases.
2009-11-16mergerichard
2009-11-16fix for UI scale != 1.0 breaking edit tools, web browser, world view rect, etc.richard
2009-11-16EXT-1478 Tool-tip background and border colors are being ignored - ↵Leyla Farazha
hooked up xml EXT-2237 Preferences > Alerts shows "$ignoretext" in the list EXT-1582 The current edit coordinates are displaced from their background EXT-1466 Change Mouselook text "Press ESC to return to World View" to match stylesheet reviewed by James
2009-11-16Fixed Stand / Stop flying buttons (EXT-2408, EXT-2467, EXT-2513).Vadim Savchuk
The buttons are now attached to the movement controls floater while it's visible (EXT-984). --HG-- branch : product-engine
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in the long run this will reduce build time. Also cleaned up a lot of header file usage to conform better to the coding standard. reviewed by james and steve.
2009-11-13EXT-2477 minimizing while in appearance editing mode leaves a bad stateNyx (Neal Orman)
when minimizing the viewer while in appearance editing mode with unsaved changes kicks you out of appearance editing mode and leaves you unable to recover as the editor always starts itself on the shape tab. Fixed this in two ways: 1) if a wearable is dirty when the editor is opened, that is the tab that is selected. 2) the camera mode is not forcibly changed away from appearance editing mode on minimize. This only needs to happen if we are in mouselook. Code reviewed by Vir. --HG-- branch : avatar-pipeline