summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated mergeRoxie Linden
2010-02-25Automated mergeRoxie Linden
2010-02-24automated mergeRoxie Linden
Don't wanna fix all windows EOL issue here warn-on-failure:unix-eol
2010-02-24automated mergeRoxie Linden
2010-02-24Automated mergeRoxie Linden
2010-02-24remove DOS newlinesRoxie Linden
2010-02-24remove windows line endingsRoxie Linden
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
Some llvoiceclient changes duplicated changes that had already been made in the voice modularization refactor, so the refactor versions were used.
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-22Removed a temporary comment.Vadim Savchuk
--HG-- branch : product-engine
2010-01-22Fixed normal bug EXT-4557 ([BSI] New IM session steals focus)Eugene Mutavchi
--HG-- branch : product-engine
2010-01-22Fixed normal bug EXT-4486(nearby voice list not aligned correctly): ↵Eugene Mutavchi
Corrected indent of my_panel content. Changed the order of buttons of avatar list item, notice that it affects all avatar lists(on people panel, group chat participants, etc). --HG-- branch : product-engine
2010-01-22No ticket, Includes cleanup. Spaces cleanup.Sergei Litovchuk
--HG-- branch : product-engine
2010-01-22Fixed (EXT-4589) 'About Land' floater loose information after user quit ↵Sergei Litovchuk
Place Profile - Fixed Places panel not to remove parcel selection when it is used by "About Land" floater. --HG-- branch : product-engine
2010-01-22Fixed bug EXT-4582 ([BSI] "Report" from avatar inspector does not ↵Vadim Savchuk
auto-populate "Abuser name" when Resident is not nearby). Added method LLFloaterReporter::showFromAvatar() to use for remote avatars. --HG-- branch : product-engine
2010-01-22Fixed normal bug EXT-4497 - Edit Profile and Edit Appearance buttons layout ↵Dmitry Zaporozhan
issue in side panel. --HG-- branch : product-engine
2010-01-22Fixed low bug EXT-4306 - Landmark name is shown with prefix in the group ↵Dmitry Zaporozhan
notice attachment. --HG-- branch : product-engine
2010-01-22fixed low bug EXT-4594 Highlight landmark on right mouse click in the ↵Denis Serdjuk
Favorites Bar --HG-- branch : product-engine
2010-01-22mergeMike Antipov
--HG-- branch : product-engine
2010-01-22mergeIgor Borovkov
--HG-- branch : product-engine
2010-01-22implemented EXT-4523 Log for all Ad-Hoc conferences is stored in one fileIgor Borovkov
* for outgoing ad-hoc sessions chat history is saved into new file for every distinct set of initial participants format: ["Ad-hoc Conference" "hash"<md5 hash of sorted participants' UUIDs>.txt] ex: Ad-hoc Conference hash77a0ff26-614d-0dbd-ce19-5da9108f141a.txt * for incoming ad-hoc sessions, chat history of each session is saved into a separate file: format: [<ad-hoc session name> <timestamp> <4 first symbols of session id>.txt] ex: Igor ProductEngine Conference 2010_01_22 07_41 2752.txt --HG-- branch : product-engine
2010-01-22Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from ↵Vadim Savchuk
Inventory floater doesn't trigger "save" button to become active). Modified LLTextureCtrl's no_commit_on_selection paramater behavior so that the widget gets dirty only on DnD or when the OK button is pressed in the picker. This is needed for panels that rely on LLTextureCtrl::isDirty() to enable their "Apply" button. --HG-- branch : product-engine
2010-01-22mergeMike Antipov
--HG-- branch : product-engine
2010-01-22mergeMike Antipov
--HG-- branch : product-engine
2010-01-22Related to normal task EXT-2214 Refactor IM Control Panels & EXT-3434 (There ↵Mike Antipov
is no difference between invited and left participants in a Group call (Voice Controls)) -- replaced functionality to delayed removing of has left voice partcipants in VCP with one implemented in changeset f48e7cc41501 Behaviour of VCP implemented in EXT-3434 was not changed --HG-- branch : product-engine
2010-01-22mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-22fix for normal EXT-4549 [BSI] assigned group roles text appears selectable ↵Ychebotarev ProductEngine
when it should not --HG-- branch : product-engine
2010-01-22mergeVadim Savchuk
--HG-- branch : product-engine
2010-01-22Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-01-22mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-22fix for normal EXT-4554 [BSI] group join now button goes missing after ↵Ychebotarev ProductEngine
failure to join due to maximum groups --HG-- branch : product-engine
2010-01-22Work on normal task EXT-2214 Refactor IM Control PanelsMike Antipov
-- removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text chat) --HG-- branch : product-engine
2010-01-22Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2010-01-22made LLTransientFloaterMgr constructor protected;Alexei Arabadji
--HG-- branch : product-engine
2010-01-22Work on normal task EXT-2214 Refactor IM Control PanelsMike Antipov
-- replaced functionality to remove speacker from the list via Event timer. -- removed calling of LLSpeakerMgr::update from LLPanelGroupControlPanel::draw() (group text chat) For now list is updated when it is need. --HG-- branch : product-engine
2010-01-22additional fix for EXT-4035 Old sidepanel tab's text remains highlighted ↵Ychebotarev ProductEngine
when switching to inventory sidepanel tab --HG-- branch : product-engine
2010-01-22win build fixedAlexei Arabadji
--HG-- branch : product-engine
2010-01-22Fixed normal bug EXT-4321 - Pop-up window with description doesn't appear if ↵Dmitry Zaporozhan
choose 'Copy SLUrl' from 'Favorites Bar' context menu. --HG-- branch : product-engine
2010-01-22fix for EXT-4540 [BSI] console flood & freeze on sorting group member ↵Ychebotarev ProductEngine
listing by role & online status and few additional fixes... LLScrollListItem->getValue() doesn't contain LLUUID anymore also fix xml - no icons in Allowed Abilities --HG-- branch : product-engine
2010-01-22Fixed low bug EXT-4596 - '99' number is displayed if there are more than 99 ↵Dmitry Zaporozhan
active notifications. --HG-- branch : product-engine
2010-01-22fixed EXT-3670 “Clicking on IM session in IM session well closes IM ↵Alexei Arabadji
floater”, implemented exclude sets for groups of transient floaters, now transient floaters not closes if user click on view from global exclude set or from floater group set; made IM floater goes foreground if it visible but not focused instead hide floater; --HG-- branch : product-engine
2010-01-22Fixed major bug EXT-4609 Deleting duplicate calling cards also removes a ↵Mike Antipov
Resident from ur Friends list :( - removed separate logic for Residents in the Friends list when Calling card is removed --HG-- branch : product-engine
2010-01-22fixed EXT-4529 [BSI] X in tabbed Instant Message functions as a minimize -Igor Borovkov
--HG-- branch : product-engine
2010-01-21Merge.Tofu Linden
2010-01-21Fix inverted logic from review.Tofu Linden
2010-01-21Soften another common llassert() failure to a warning.Tofu Linden
2010-01-21Partial fix for EXT-4508 (nearby media floater parcel media button breaks rtsp)Monroe Linden
This is actually two seperate issues: 1) After disabling parcel media from the nearby media floater, it can't be re-enabled 2) When you disable parcel media from the nearby media floater, faces displaying it don't revert to their original texture This change fixes issue (1), by forcing the priority of the inworld media instance to normal in LLViewerMedia::updateMedia() so it will always get reloaded instead of possibly being kept unloaded due to already-loaded prim media. Issue (2) is still under investigation. In addition to the case where you disable parcel media from the nearby media floater, it also doesn't restore the textures when you leave the parcel, and I think I've even seen it when unloading