summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-06-15Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseLynx Linden
2010-06-15EXT-7851 FIXED Cleaned up code to avoid confusion.Lynx Linden
The mTmpWriteBuffer member variable was never actually being allocated because it was being shadowed by a local variable. This is why the code never crashed. I've removed the member variable as it was clearly never used and really confused the code.
2010-06-15fix minor xml barf.Tofu Linden
2010-06-15merge fix in unrelated file.Tofu Linden
2010-06-15final(?) merge to revert snapshot floater to 2.0.1 level.Tofu Linden
2010-06-15Backed out changeset 1acc14a5e7acTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset 388c6d09894aTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset b447707f20f5Tofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset 1c66b34b7fbeTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset c9dd9852d76bTofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset d632626f9b11Tofu Linden
2010-06-15merge backoutTofu Linden
2010-06-15Backed out changeset 688db499e2d1Tofu Linden
2010-06-15merge backoutTofu Linden
2010-06-15Backed out changeset ccbf22ff283cTofu Linden
2010-06-15merge backoutTofu Linden
2010-06-15Backed out changeset 68feae2ef00aTofu Linden
2010-06-15merge backoutTofu Linden
2010-06-15Backed out changeset fb6c9a1cebfcTofu Linden
2010-06-15merge backoutTofu Linden
2010-06-15Backed out changeset 2f4b18cc2bbfTofu Linden
2010-06-15merge reversion, leaving lldate intact.Tofu Linden
2010-06-15Backed out changeset 6d51a12cb2d8Tofu Linden
2010-06-15SNOW-620 PARTIAL Infinite loop in LLSphere::getBoundingSphereTofu Linden
Neither the test nor the code being tested are good - the unit test can hang. Skipping test for now, passing over to the sim maint backlog.
2010-06-15VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errorsTofu Linden
2010-06-15EXT-7348 Can't open Advanced Menu in Linux ClientTofu Linden
Added a new, preferred shortcut for Show Advanced Menu, that isn't eaten by the desktop on Linux. The old shortcut also works.
2010-06-15Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-06-15EXT-7783 ADDITIONAL FIX Corerected emitting BOF changed/replaced signals in ↵Alexei Arabadji
LLOutfitObserver. Emitting COF changed shouldn't block emitting BOF changed/replaced signals. reviewed by Mike Antipov --HG-- branch : product-engine
2010-06-15EXT-7794 FIXED Implemented a common-used notification about wearing outfit ↵Mike Antipov
to display loading indicator. Details: * Added signal "Wearable Loading Started" in AgentWearables (in parallel with "Wearables Loaded") * Now it is raised from the LLAppearanceMgr::wearInventoryCategory. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/583/ --HG-- branch : product-engine
2010-06-15Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-06-14re-disabled old style properties floaterRichard Nelson
2010-06-14mergeRichard Nelson
2010-06-14EXT-7742 WIP "Add to Outfit" type filter should contain items for each ↵Richard Nelson
wearable type and for each category added ability to filter inventory folder view by wearable type
2010-06-14mergio mergioPalmer Truelson
2010-06-14Fixing viewer_manifest.py. upper case True needed. Reviewed by ManiPalmer Truelson
2010-06-14mergeRichard Nelson
2010-06-14EXT-7742 WIP "Add to Outfit" type filter should contain items for each ↵Richard Nelson
wearable type and for each category added ability to filter inventory folder view by wearable type
2010-06-14Fix mac dev build error, mac always package.palange
2010-06-14Automated merge with ssh://hg.lindenlab.com/q/viewer-releasepalange
2010-06-14Fix mac dev build error.palange
2010-06-14Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseAndrew A. de Laix
2010-06-14Fix EXT-7583: changed message to something more reasonable.Andrew A. de Laix
2010-06-14EXT-7524 FIXED Save snapshot to inventory results in crashAimee Linden
Moved confirmSavingTexture() and onSavingTextureConfirmed() from LLSnapshotLivePreview to LLFloaterSnapshot::Impl so that the notification confirmation completes before LLFloaterSnapshot is closed.
2010-06-14Automated merge with ssh://hg.lindenlab.com/dessie/viewer-releaseRichard Nelson
2010-06-14mergeRichard Nelson