summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-09-16mergeBrad Payne (Vir Linden)
2011-09-16SH-2440 FIX - first build, then test, then commitBrad Payne (Vir Linden)
2011-09-16SH-2440 FIX - avoid calling initInstance() on LLVOAvatarSelf if it already ↵Brad Payne (Vir Linden)
exists
2011-09-16mergeBrad Payne (Vir Linden)
2011-09-16merge changes for storm-1578Oz Linden
2011-09-15mergeBrad Payne (Vir Linden)
2011-09-15mergeBrad Payne (Vir Linden)
2011-09-15Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-09-15mergeBrad Payne (Vir Linden)
2011-09-15merge changes for storm-1599Oz Linden
2011-09-15merge changes for storm-1595Oz Linden
2011-09-15merge changes for storm-1585Oz Linden
2011-09-14mergeBrad Payne (Vir Linden)
2011-09-14merge changes for storm-1562Oz Linden
2011-09-14Trying to fix Mac build issueBrad Payne (Vir Linden)
2011-09-14merge possible fix for storm-1562Oz Linden
2011-09-14mergeprep
2011-09-14Fix for CTS-804. Added support for parsing translations from ↵prep
Blenders(v2.5.9) transform SID's.
2011-09-14STORM-1578 (viewer side only), STORM-1589Oz Linden
Remove the viewer side automatic logout after extended away time. Note, however, that the server still logs you out after 30 minutes away: see SVC 7251. Allow more time (10 seconds vs 2 seconds) after initiating Away status during which mouse movements do not remove the Away status.
2011-09-14merge changes for storm-1532Oz Linden
2011-09-13SH-2353 FIX selection streaming cost always says 0.0Nyx (Neal Orman)
PE found that the streaming cost function definition wasn't lining up with its inherited function definition. Fixed the inhereted funciton definition to add the new parameter. Selection streaming cost works again, though client-side generated. Should probably depricate/remove this feature.
2011-09-13SH-1601 SH-1958 FIX large objects cannot always be selected/modifiedNyx (Neal Orman)
The selection distance limit was set at 64m. Now that we have 64 meter prims this means that you can see objects that you couldn't reliably select, or couldn't always scale up to full scale. Doubled the limit to 128, and selecting and scaling operations appear to work fine, even for 64m objects.
2011-09-13Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-09-13mergeNyx (Neal Orman)
2011-09-13SH-2420 FIX update labeling in about land floaterNyx (Neal Orman)
About land was still referring to the capacity of land in terms of "prims" The new terminology refers to this as land capacity, so that we can get away from the "prim equivalent" terms, as they are confusing.
2011-09-13merge changes for 3.0.3 beta 2 fixesOz Linden
2011-09-13STORM-1562 Potential fix for crash in LLCurl::run -- make sure all ref ↵Dave Parks
counted members of llsecapi are thread safe
2011-09-13STORM-1562 Potential fix for crash in LLCurl::run -- don't run ↵Dave Parks
curl_multi_perform from multiple threads simultaneously.
2011-09-13SH-2400 FIXED crash on model upload.Seth ProductEngine
Added checks for LoD strings array index bounds.
2011-09-13mergeBrad Payne (Vir Linden)
2011-09-13STORM-1599 FIXED Scrolling search history with mouse wheel now doesn't zoom ↵Vadim ProductEngine
the wold view upon reaching the end of list.
2011-09-13STORM-1595 FIXED Removing a wrong debug assertion.Vadim ProductEngine
2011-09-13STORM-1585 FIXED Duplicated/missing XUI IDs in floater_preferences_proxy.xml.Vadim ProductEngine
2011-09-12sh-2379: re-enable multi-threaded curl (fixes viewer stall, may re-introduce ↵Oz Linden
some crashes)
2011-09-12merge changes for storm-1593 (marketplace inbox)Oz Linden
2011-09-12BUILDFIX GCC fixing unused variableNyx (Neal Orman)
2011-09-12Removed windows line endings to conform to coding policy.Leslie Linden
2011-09-12merge changes for storm-1587Oz Linden
2011-09-12merge changes for storm-1297Oz Linden
2011-09-12merge changes for storm-1028Oz Linden
2011-09-12merge changes for storm-918Oz Linden
2011-09-09Update types from time_t to F64 to fix type conversion error related to ↵Leslie Linden
timestamps.
2011-09-09merge changes for storm-1590Oz Linden
2011-09-08Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-mergeRichard Linden
2011-09-08EXP-1196 FIX Fix param block template orderingRichard Linden
2011-09-08Clean up erroneous XUI parsing errors.Leslie Linden
2011-09-08MergeLeslie Linden
2011-09-08fix for held down delay not parsing from xuiRichard Linden
2011-09-08Backed out changeset: b5b389170dcdRichard Linden
2011-09-08mergeprep