summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-14Allow selection of media faces even if there is no impl. We recordRick Pasetto
the target object and use that fact to raise its interest level. This is mostly a pass-off for monroe to take and run with
2009-12-14Mergeskolb
2009-12-14Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-14Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-14EXT-3426: Update Place buttons based on state.Lynx Linden
We now disable the teleport/map buttons when they cannot be used (when we don't have a global 3D position for the parcel). We also update this button enable state at the right times.
2009-12-14EXT-3426: Enable Teleport/Map buttons for all Places.Lynx Linden
When we open the Places side tray for a parcel, given a UUID, we now look up the parcel's global 3D position so that the teleport and map functions work correctly.
2009-12-14automated merge avp->viewer2.0Loren Shih
2009-12-14automated merge viewer2.0->viewer2.0Loren Shih
2009-12-14For EXT-3264: Missing separators in inventory context menus - restoreBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-13EXT-2764 EXT-2766 add and remove help ids to reflect realityKent Quirk
2009-12-12mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2009-12-11replace some magic numbers of http status, and fix for DEV-40952/SNOW-208: ↵Xiaohong Bao
HTTP GET requests for textures check for http status 203, but should check for 206.
2009-12-11EXT-3278: copy & wear in object inventory is now only enabled if we can wear ↵Eric M. Tulla (BigPapi)
contents
2009-12-11In LLPluginProcessParent, instead of killing the plugin process, terminate ↵Monroe Linden
it by closing the sockets. This lets it do some cleanup before exiting, instead of just getting shot.
2009-12-11For EXT-3264: Missing separators in inventory context menus - restoreBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11Mergeskolb
2009-12-11EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.Loren Shih
Background fetches track whether they're being done on MyInventory, Library, or both. Also did some cosmetic header file cleanup.
2009-12-11DEV-40452 (followup) Correct a few more inconsistencies in the 3 new LSL ↵Ramzi Linden
editor tooltips
2009-12-11fix multiple heads in repoEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-11resolving sidepanel conflictErica
--HG-- branch : avatar-pipeline
2009-12-11automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-11EXT-3373 : Favorites folder disappears after canceling filterLoren Shih
Doing a more robust check to see if folders need to be refreshed. --HG-- branch : avatar-pipeline
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-11EXT-906 Update inventory properties floater with new permissions layoutErica
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