summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-10Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-10merge.Tofu Linden
2009-11-10L10N: Add some translations to FR, DE, JA from Localization Cycle1.Ramzi Linden
2009-11-10mergeRamzi Linden
2009-11-10I18N: several nodes in XUI have no name= or a duplicate name=, thus cant be ↵Ramzi Linden
localized. Notifications console was listed twice in the Develop>Console menu
2009-11-10Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10DEV-35097 final check in XUI for instances of the nonapproved terms "2nd ↵Ramzi Linden
Life", "1st Life", "SLURL"
2009-11-10Develop>XUI>Send Test IMs: Lets not poke fun of a resident tradition in the ↵Ramzi Linden
public beta. Also it should test a sentence that wraps. Ideally it would also test a string with double-byte characters but I dont know how to do that.
2009-11-10Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10clean up include llfontglangela
2009-11-09LLViewerMediaImpl now keeps track of which instance is the current parcel ↵Monroe Linden
media instance. The active parcel media instance always gets priority over other inworld media.
2009-11-09PARTIAL FIX (workaround) DEV-41949: LLMediaEntry::setWhitelist() and ↵Rick Pasetto
LLMediaEntry::asLLSD() have a contract conflict Review #31 So, here's what was happening, briefly: - LLMediaEntry::setWhitelist() would be a no-op if given an LLSD that did not have a WHITELIST_KEY - LLMediaEntry::asLLSD() would render the LLMediaEntry *without* a WHITELIST_KEY if the whitelist was empty Therefore, when the viewer marshalled an LLMediaEntry for the server, it would send it without a WHITELIST_KEY. When the server got it, it would not erase the last value. This is actually a workaround: it patches asLLSD() with an LLSD::emptyArray() if the key is not there. However, this should be fixed on the server: in either or both of the following ways: 1) LLMediaEntry::setWhitelist() should not be a no-op if the LLSD has no WHITELIST_KEY: it should erase the whitelist 2) LLMediaEntry::asLLSD() should render an empty whitelist in WHITELIST_KEY as an empty array Note that both could be done and still work. A unit test should and will be written next.
2009-11-09Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-09Refinement to my previous commit:Monroe Linden
Created LLViewerMediaImpl::unload(), which unloads the media and clears internal state (such as the last-navigated URL) to keep it from getting reloaded. LLViewerMedia::updateMediaImpl() now calls unload() on the impl instead of just using destroyMediaSource().
2009-11-09FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"Rick Pasetto
This change gets rid of the crufty (and confusing) "apply()" functions from llpanelmediasettings*. Those functions were never being called, yet changes were being made in them. Instead, I added "preApply()" and "postApply()" to each of these panels, which the floater (who really does the "apply()"ing) now calls before and after it applies the changes to the media data.
2009-11-09Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-09Dev-42424 Turning on impostors for intel cards above 965Palmer
2009-11-09Fix for DEV-42029 (changing media on multiple faces can make a zombie SLPlugin).Monroe Linden
Made LLViewerMedia::updateMediaImpl() unload the impl's media plugin when the current URL goes empty. Made LLVOVolume::syncMediaData() call removeMediaImpl() if the media data gets deleted.
2009-11-10DEV-41317 DEV-42311: Enabled the "Call" button in more side panels.Lynx Linden
The various People panels now have Call buttons that work. Currently we only support single selection of users in lists for P2P voice chat. Multiple selection for ad-hoc chat is next...
2009-11-09mergeBrad Payne (Vir Linden)
2009-11-09mergeJames Cook
2009-11-09DEV-42409 Email snapshot now fills in sender email address as before.James Cook
Sending now works. Reviewed with Ambroff.
2009-11-09Disabled saving notifications to disk because the load code hasn't worked ↵James Cook
for months, it spams the logs, and it hits the disk. Discussed with Q, the author.
2009-11-09First name field on login screen is now same size as last name.James Cook
Reviewed with Ambroff
2009-11-09Merge with tipcallum
2009-11-09Fix for DEV-41797 - "LL_QUICKTIME_ENABLED is often unset on Windows builds"callum
2009-11-09ext-1444 log, speak and gestures btns don't have tool-tipsLis Pardi
These changes had been made last month, but got smooshed.
2009-11-09Removed some log file spam.Brad Payne (Vir Linden)
2009-11-09mergeLoren Shih
2009-11-09Fix signed/unsigned build breakage in llvovolume.cppJames Cook
2009-11-09For EXT-2325: Should purge inventory cache moving from 1.23 to 2.0.Brad Payne (Vir Linden)
Added a version field at the beginning of inventory cache files. If version field is not found or does not match expectected value, then the cache is discarded. In 1.23, the version line triggers a warning but is otherwise ignored. Reviewed by Seraph.
2009-11-09For EXT-2335 Diagnose warning spam: "LLInventoryPanel::buildNewViews called ↵Loren Shih
with invalid objectp->mType" Trivial fix to just ignore reading in items that have unknown/none asset type.
2009-11-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2009-11-09EXT-2326 Editing appearance causes too many texture callbacks stalls the viewerNyx (Neal Orman)
problem was caused by triggering updateMeshTextures() every time visual params or textures were changed on your base avatar object. The latest structure makes the parameters and textures in the wearables authoritative, causing them to be copied to the avatar on a regular basis. This resulted in way too many callbacks to be registered while waiting for baked textures to be uploaded. Fixed by removing many calls to updateMeshTextures() and ensuring that it gets called every time an appropriate param or texture actually changes, or a wearable gets added/removed. This appears to cut the number of callbacks to a reasonable level. Code reviewed by Bigpapi.
2009-11-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-09DEV-41358: Renamed the title of the search floater to be "Find".Lynx Linden
As requested by the search team.
2009-11-09Better fix for DEV-42153.Monroe Linden
2009-11-09Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/Lynx Linden
2009-11-09DEV-41317 DEV-41318: Enabled the Call button in the Profile panel.Lynx Linden
I've added a new LLAvatarActions::startCall() method to make it easy to start a new P2P call. The Resident Profile "Call" button is now hooked up to this. I've also put back the "Call" menu in the avatar popup menu and hooked this up too. While I was there I noticed that the "IM" popup menu code could all be removed in favor of a call to LLAvatarActions::startIM().
2009-11-09mergeJames Cook
2009-11-09Fixed crash on hovering over debug rendering menu due to texture atlas.James Cook
2009-11-09merge.Tofu Linden
2009-11-09remove debug spew.Tofu Linden
2009-11-09Smarter mildly-refactored voice-toggle state management.Tofu Linden
2009-11-09don't have the 'speak' button be, technically, a toggle buttonTofu Linden
- we'll be managing its state rather manually, not necessarily conforming to 'toggle' semantics.
2009-11-09EXT-1866 : Inventory Side PanelLoren Shih
Various trivial UI behavioral changes for disabling/enabling old/new floaters when bringing up properties of objects/items. This is to make the UI behavior compliant with the Inventory Panel MVP. Also added missing sidepanel_task_info.xml (although this is not actually enabled for viewer2.0).
2009-11-09Central-source the authoritative state of mic openness.Tofu Linden
2009-11-09remove #include no longer needed.Tofu Linden
2009-11-09Don't have LLVoiceClient manually poke the nearbychatbar's 'speak' button's ↵Tofu Linden
visual state as a special case - all speak buttons will soon know how to poll (sigh) the ptt state, with more reliability.
2009-11-10fix xml function param problem and adding missing settings in settings.xmlangela