summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-11Mergeskolb
2009-12-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-11EXT-3408: Added support for secondlife:///app/classified SLurlsLynx Linden
I added a handler for this SLurl type that displays the classifieds details in the side tray. In order to do this, you have to open the profile of the classified's creator first. Which means that I have to ask the server for the classified's description in order to get the creator id. This is done with an LLAvatarPropertiesObserver observer. One complication here is that this observer takes the avatar id as a parameter, but we don't know that (that's what we're trying to find out) - so I made it possible to pass in a null avatar id - it's only used to filter out non-interested observers in the notifyObserver() call.
2009-12-11Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-11Fix linux buildRick Pasetto
2009-12-11Minor gcc compile fixEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-11Merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-11EXT-3317 missing string in appearance editorNyx (Neal Orman)
name string wasn't capitalized so couldn't find the actual label to apply. capitalizing "Wrinkles" makes the string be found. yay. Reviewed by Vir
2009-12-11Automated merge with ssh://nyx@hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-11Merge media back into viewer 2-0skolb
2009-12-11EXT-2718 avatar render cost higher in 2.0 than in 1.23Nyx (Neal Orman)
previous fix fixed the double-counting of texture costs. resulting ARC was ~99 points higher for most avatars. This patch makes the cost shoot up again, as ARC was improperly computed in 1.23 and before. This makes the cost for an avatar increase 10 points per prim instead of per-attachment, which is how we have documented it. Also used constants to eliminate magic numbers and increased ARC limit from 1024 to 2048. Will request feedback on change from BSI:STU Code reviewed by Bigpapi --HG-- branch : avatar-pipeline
2009-12-11Merge viewer 2-0 into mediaskolb
2009-12-11EXT-3394: Remove manual voice gain controls.Lynx Linden
The new Vivox SDK supports Automatic Gain Control (AGC), so we shouldn't need to change the local gain level from the default of 50%. This change sets the initial gain level to 50 (instead of 62) and removes the local gain sliders from the Sound Preferences floater and the Voice Controls floater. The latter was not hooked up yet anyway.
2009-12-11mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-11EXT-3119 DEV-43503 DEV-43497: Fix secondlife://app/parcel crash.Lynx Linden
The handler for secondlife:///app/parcel/{UUID}/about SLurls now opens the Place side tray and displays the parcel information there.
2009-12-11EXT-332: Added Buy L$ link for Exchange Rate.Lynx Linden
As per the international billing team. Just waiting for the "payment method and currency" URL now.
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-10Add LL(URLDispatcher,CommandDispatcher,PanelLogin)ListenerNat Goodspeed
LLURLDispatcherListener accepts requests for LLURLDispatcher. LLCommandDispatcherListener accepts requests for LLCommandDispatcher. LLPanelLoginListener accepts requests specifically for LLPanelLogin. Initially it supports a simulated click to the "Log In" button.
2009-12-10DEV-44138 About Land - Access tab - make AO overriden options clearSoft Linden
2009-12-10EXT-3302 invisible avatar w/ bling crashes mac viewersNyx (Neal Orman)
not mac-specific. We were treating IMG_INVISIBLE as a baked texture when an avatar used it as a bake. However, some baked textures have 5 channels, IMG_INVISIBLE has 4. Asking KDU to decode the 5th channel of a 4 channel image resulted in a crash. Fix skips the callback for loading morph masks from a bake if the bake image ID is IMG_INVISIBLE. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-12-10Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-10Added better error handling to LLEventHost, so we no longer crash when ↵brad kittenbrink
shutting down. Also cleaned up logging in llstartup, llwlparammanager, and llwaterparammanager. reviewed by Mani.
2009-12-10DEV-44130 Clarify AO messages on Region/Estate - Region tabSoft Linden
2009-12-10PARTIAL DEV-43869 - add "isInterestingEnough()" to the queue calculationRick Pasetto
This change bumps the queue sizes way up, because we think that the "isInterestingEnough()" call will prevent loading more media data than we think is necessary. Still need to implement it in LLVOVolume, though
2009-12-10Merge changesSoft Linden
2009-12-10DEV-28327 Remove ELAR email field from clientSoft Linden
2009-12-10For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2009-12-10Fix for DEV-41388 (SNOW-307: Linux viewer builds renames gstreamer plugin to ↵Monroe Linden
quicktime.) Of the four options suggested in the jira, this is a modified version of #2. Since the mime_types.xml file actually gets localized (it contains a bunch of user-visible text in addition to the mappings), I don't think renaming it in viewer_manifest.py will work. Instead, I've created additional files (mime_types_linux.xml and mime_types_mac.xml) in the same location, and changed the code that loads the file in LLAppViewer::init() to look for different names per-platform. I'm sure there are cleverer solutions (such as abusing the translation xml overlay system to create files that have deltas per platform), but those don't fit in the time-box allocated to this issue.
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2009-12-10Delete the 'Test' language from the viewer.Ramzi Linden
There is no more time to update it to last month of UI changes; and its use for Localizability Testing is now done.
2009-12-10fix for DEV-43870: EXT-3137: Crash when add quicktime media to multiple faces.Xiaohong Bao
2009-12-10Fix for r. click Edit on a link to wearableBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10Fix for the last case in DEV-43052.Monroe Linden
In proximity_comparitor(), if the impls have exactly the same distance, return the result of comparing the impl pointers. This will give them a completely arbitrary ordering, but it will be stable...
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-10DEV-43977: Changed pre-login help browser behavior.Lynx Linden
The special pre_login_help topic is now only displayed when the user clicks on the "Need help logging in?" link on the login screen, or selects the top-level Help > Second Life Help (F1) menu.
2009-12-10PARTIAL DEV-43869: LLMediaDataClient now uses two queuesRick Pasetto
This is a fairly major change that addresses the issue of an object with constantly-updating media. Before, that object would be put into our single queue and sorted to a particular spot, and since it continuously updates, it would "always be there". That means that nothing "behind" it would ever get serviced. This change introduces two queues for each MDC: one is the same "sorted" queue as before, and the other is unsorted, and "round-robins". New objects go into the sorted queue, objects whose media we already know about get put into the unsorted queue. The two queues are interleaved when serviced (one then the other is serviced -- if one is empty we try the other -- until they are both drained). The round-robin queue works a little differently: after an item is fetched from that queue (remember this would be an item we already know about), that request is marked and put back at the end of the queue. If that object gets a UDP update while in the queue, that mark is "cleared". When it gets to the front of the queue again, if it still marked, it is thrown away. If it is not marked, it is fetched, and again marked and put at the end. This makes the queue self-limiting in how big it can get. I have also made some other changes: - The sorting comparator now just delegates to the object for its "interest" calculation. A higher value = more interesting. LLVOVolume now uses its PixelArea for its "interest" calculation, which seems apparently better (the prior distance calculation was wrong anyway). - The score is cached before the sort operation is performed, so that it won't be expensive to sort - Now, the media version that is fetched is saved in the LLVOVolume, and we do not update if it is not newer (this is not very useful...yet.) - I've introduced hard limits (settable by debug settings) on the size of the queues. The sorted queue will be culled (after sort) to that count. NOTE: this will probably get removed in a later checkin, as I've already gotten feedback that this is not desirable - I've reorganized LLMediaDataClient so it makes more sense. - I've made the request object a little smaller, so the queue won't take up so much memory (more work could be done here) - Added a unit test for the two-queue case (though more tests are needed!)
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-10Fix for EXT-3368 - "Save Texture" functionality was no longer respecting permsEric M. Tulla (BigPapi)
2009-12-10For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-10automated merge viewer2.0->viewer2.0Loren Shih
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-10Fix llmediaplugintest.cpp for non-Windows platformsNat Goodspeed
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-10dos2unix fix for llpanelgroup.cpp.Loren Shih
2009-12-10automated merge viewer2.0->viewer2.0Loren Shih
2009-12-10Dos2Unix fix for llselectmgr.cppLoren Shih