summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-01-25EXT-4712 - Upgraded some 7000 series cards and 9000 series cards from class ↵Palmer
2 to 3 for more lights. No code changed.
2010-01-25MergeEli Linden
2010-01-25EXT-4388 Crash in octree line segment intersection codeTofu Linden
a more complete fix and some sanity to prevent recurrance of a similar problem. reviewed by bao!
2010-01-25test change.Eli Linden
2010-01-25MergeEli Linden
2010-01-25harmless test commit to work with eli.Ramzi Linden
2010-01-25MergeEli Linden
2010-01-25We already have a LL_FORCE_INLINE in llpreprocessor.h, don't re-invent it ↵Tofu Linden
for llfasttimers.h. Also define LL_LIKELY/LL_UNLIKELY with a warning about its micro-optimizey nature, and use it to annotate llasserts (i.e. make llassert() lower-overhead and thus more attractive, even in inner-ish loops.)
2010-01-25test change.Eli Linden
2010-01-25Gosh, the mac prototypes for get_cpu_clock_count_64 have always been wrong, ↵Tofu Linden
but the compiler didn't start caring until I made these proper member functions. fixed.
2010-01-25DEV-45468 'SNOW-108: Fast timers are broken / badly-scaled on linux' ready ↵Tofu Linden
to merge. legacy coding policy fix-up.
2010-01-25merge.Tofu Linden
2010-01-25Final fix for fast timer reshuffle.Tofu Linden
2010-01-25shuffle shuffle of timer code. cleanup.Tofu Linden
2010-01-25pull in the linux+solaris fast-timers impl from snowglobe, fit it into ↵Tofu Linden
viewer2, start moving headers around.
2010-01-25test commitEli Linden
2010-01-25Merge conflict resolution.Tofu Linden
2010-01-25PE merge.Tofu Linden
2010-01-25Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-25"Fix" confusion over media settingsRick Pasetto
Review #89 This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular: - "Media Enabled" pref now only controls "AudioStreamingMedia" - No more "tentative" state - New "Music Enabled" pref - First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better) - Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater - Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-25fixed EXT-4601 [BSI] New IM sessions use obsolete timestamps for first messageIgor Borovkov
--HG-- branch : product-engine
2010-01-25implemented EXT-4567 [BSI] private voice floaters do not contain standard X ↵Igor Borovkov
buttons --HG-- branch : product-engine
2010-01-25Related to normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve ↵Mike Antipov
settings per resident between voice sessions) - moved default internal voice level value into application settings - cleanned up include list in llmutelist.cpp --HG-- branch : product-engine
2010-01-25Fixed normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve ↵Mike Antipov
settings per resident between voice sessions) - moved necessary functionality from LLMuteList to LLVoiceClient. It was used only in active speackers floater which is deprecated. - initialized saving/loading of voice level in voice client. - also saving voice levels between session is activated. --HG-- branch : product-engine
2010-01-25fixed linux buildIgor Borovkov
--HG-- branch : product-engine
2010-01-25(EXT-2249) Place profile data blinks several times while updating after teleportSergei Litovchuk
- Reduced place info unnecessary text and icons updates. --HG-- branch : product-engine
2010-01-25implemented EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS ↵Igor Borovkov
auto-response added a modal warning window "Non-friends won't know that you've choosen to ignore their calls and instant messages." --HG-- branch : product-engine
2010-01-25mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-25sidefix for EXT-4577 Group profile: useless tab controls appear inside ↵Ychebotarev ProductEngine
Land/Assets accordion if you place UI elements __outside__ of panel rect - they will be visible but unclickable... so I revert UI changes since they are maybe looks better...but useless. --HG-- branch : product-engine
2010-01-25EXT-4576: Changed the pre-login help behavior.Lynx Linden
The F1 help topic now means: if the user is not logged in yet, show the pre-login topic instead of the default fallback topic, otherwise show help for the focused item
2010-01-25fixed bug EXT-4433 [BSI] friend privacy settings greyed outDenis Serdjuk
EXT-4353, EXT-4587, EXT-4442 have same cause. it should fix they. --HG-- branch : product-engine
2010-01-25Merge with default branchMike Antipov
--HG-- branch : product-engine
2010-01-25mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-25fix for major EXT-4621 Clicking the Nearby Voice floater steals keyboard focusYchebotarev ProductEngine
note - didn't do this in xml since chrome="true" in xml hides floater caption --HG-- branch : product-engine
2010-01-25Related to normal bug EXT-3880 ( [BSI] functionality loss - online status in ↵Mike Antipov
profile) -- removed logic to process online status (LLPanelAvatarProfile::fillOnlineStatus) for non-existent view (name="online_status") on profile page --HG-- branch : product-engine
2010-01-25Fixed normal bug EXT-3880 ( [BSI] functionality loss - online status in profile)Mike Antipov
-- removed logic implemented for EXT-2022 (show "Online" status or nothing) -- removed deprecated method LLPanelProfileView::togglePanel -- implemented required bihavior (for friends): --- Online when online and privacy settings allow to show --- Offline when offline and privacy settings allow to show --- Else: nothing -- also implemented bihavior for non-friends to use global Preference: "Only Friends & Groups can see when I am online" --- Online when online and was not set in Preferences/"Only Friends & Groups can see when I am online" --- Else: Offline --HG-- branch : product-engine
2010-01-25fixed EXT-3395 "Docked IM/Chat windows shouldn't hide when voice control ↵Alexei Arabadji
panel is opened", added transient controls group 'DOCKED' for temporary excluded docked floaters and dock widgets; --HG-- branch : product-engine
2010-01-22Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-22merge.Tofu Linden
2010-01-22Remove code that enables tooltip inspector hover over media objectRick Pasetto
(note: reverts changeset b6b3a58fdb30)
2010-01-22DEV-43688 commit revised FR translations - FR cycle2Ramzi Linden
2010-01-22Linux: Don't strip or tar the viewer if it's not a release build.Tofu Linden
This is some more work towards making RelWithDebInfo very developer-friendly.
2010-01-22Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-22Fix assert in lldictionary as used by llfoldertypeRick Pasetto
Review #88 This assert might be valid in general, but LLFolderType has a valid reason for getting "not found"
2010-01-22PARTIAL FIX EXT-3491: only bring up "external browser"notification if target ↵Rick Pasetto
is external or pref is set Review #86 This changes the logic to bring up the notification "Do you want to open your Web browser to view this content?" only if either the target is _external, or the user pref says to. Otherwise it avoids the notification.
2010-01-22DEV-43688 fix a couple of formatting issues on strings in the localized ↵Ramzi Linden
languages related to Localization Cycle 2.
2010-01-22merge.Tofu Linden
2010-01-22Fixed normal bugs EXT-4450 ([BSI] call buttons enabled when voice is ↵Andrew Dyukov
disabled) and EXT-4313 (Should not be able to start a call when voice is disabled). Call buttons state now reacts on voice changes in time. - Added voiceWorking() method to LLVoiceClient to determine real availability of voice, because voiceEnabled() doesn't take into account possible errors. Perhaps there is no need in two methods- some investigation will be made and depending on its results they may become one non-static method. voiceWorking() uses state of voice client(mState) to determine voice availability. Also some states which are not currently counted by voiceWorking() as valid may be added if testing reveals problems. - To enable/disable call buttons in time, LLVoiceClientStatusObserver is used. Its trigger uses states from its enum only to skip updating button in some states(to avoid button blinking), but to determine button state LLVoiceClient's voiceWorking() is used. --HG-- branch : product-engine
2010-01-22Fixed bug EXT-4580 (Duplicated avatar's name appears in 'Group invitation' ↵Vadim Savchuk
floater if use context menu for invitation). Because duplicated postBuild() calls, the "OK" button callback was set and *called* twice. --HG-- branch : product-engine
2010-01-22automated merge viewer2.0->viewer2.0Loren Shih