summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-05Fix Mac llmediaplugintest build breakage.Nat Goodspeed
A viewport array passed to glGetIntegerv() and gluUnProject() was declared as 'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works.
2010-03-05EXT-5698 undo local FR override (not good practice); fix EN instead for ↵Eli Linden
consistency, and to allow for ES longer translation of "Buy" (Erica changed "Buy L$" to "Buy" to mitigate the problem)
2010-03-05MergeEli Linden
2010-03-05beta 4 JA linguisticEli Linden
2010-03-05merge.Tofu Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-05PE merge.Tofu Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-05mergeVadim Savchuk
--HG-- branch : product-engine
2010-03-05Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-05EXT-5847 failure to bake when standard wearables are generatedNyx (Neal Orman)
Standard wearables have no textures associated with them. No textures means no texture callbacks. Fixed the issue by requesting a texture upload on baked textures that we don't get a cahced baked texture response for. This clears up the repro Code reviewed by prep, vir
2010-03-05merge.Tofu Linden
2010-03-05Backed out changeset ede35a3eda50 - restore EXT-5891Tofu Linden
The specs contradict themselves and I *like* this interpretation better.
2010-03-05Update for major bug EXT-5943 - Classifieds are Published and charged as ↵Dmitry Zaporozhan
soon as you hit Save. Fixed category mismatch after editing classified. Made price uneditable in edit mode because it looks like server does not support price update(same in viewer 1.23) --HG-- branch : product-engine
2010-03-05Implemented (EXT-4705) Show maturity icon on Region/Estate tab.Sergei Litovchuk
- Added LLIconsComboBox class - a combobox with icons for maturity ratings. - Fixed scroll list maximum width calculation. The width was calculated based on text value width for non-text columns. - Added image overlay alignment getter method to LLButton. --HG-- branch : product-engine
2010-03-05Fixed (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
- Added icons updating upon opening Prefs -> General panel. --HG-- branch : product-engine
2010-03-05mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-03-05PE merge.Tofu Linden
2010-03-05fix for normal EXT-1888 Apply button remains active after Applying changesYchebotarev ProductEngine
--HG-- branch : product-engine
2010-03-05Merged recent PE classified panel changes with LL fixes for EXT-5824, ↵Dmitry Zaporozhan
EXT-5860 and EXT-5859. --HG-- branch : product-engine
2010-03-05Updated LLPanelClassifiedInfo::resetData() with recentrly added controls.Dmitry Zaporozhan
--HG-- branch : product-engine
2010-03-05Update for normal sub task EXT-5856 - "Auto renew each week" checkbox is ↵Dmitry Zaporozhan
displayed in the Classified Info from other resident profile. Replaced auto_renew checkbox with textbox. --HG-- branch : product-engine
2010-03-05merge conflictsangela
2010-03-05 EXT-5698 Media/Play pause are trunkated in french floater.angela
2010-03-04beta 4 JA linguisticEli Linden
2010-03-04MergeEli Linden
2010-03-04CT-575 ES xlationEli Linden
2010-03-04Merge with tipCallum Prentice
2010-03-04Changes to plugin test app in preparation for work on positional per-process ↵Callum Prentice
audio for media. Not part of the client and nothing here is deployed - internal testing only.
2010-03-04Fix for EXT-5960 (Store media cookies per user rather than per viewer)Callum Prentice
Reviewed by RN and MW
2010-03-04EXT-2188 PL set5A xlation; 1 JA ling fixEli Linden
2010-03-04EXT-2188 PL set5A xlation; 1 JA ling fixEli Linden
2010-03-04fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: ↵Xiaohong Bao
LLWorkerClass::checkWork: ASSERT(workreq).
2010-03-04beta 4 JA linguisticEli Linden
2010-03-04MergeEli Linden
2010-03-04CT-575 DA xlation, new filesEli Linden
2010-03-04CT-575 DA xlationEli Linden
2010-03-04automated merge viewer2.0->viewer2.0Loren Shih
2010-03-04EXT-5296 : Inventory folders revert to defort "sort" with each loginLoren Shih
Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code. Makes this sorting code a lot easier to debug.
2010-03-04VWR-18007Eli Linden
2010-03-04Fix for EXT-5935Monroe Linden
Decrease PluginInstancesCPULimit default value from 1.0 to 0.9.
2010-03-04MergeEli Linden
2010-03-04MergeEli Linden
2010-03-04merge.Tofu Linden
2010-03-04EXT-5296 : Inventory folders revert to defort "sort" with each loginLoren Shih
Not my code, but ended up being a simple enough XML fix. Inventory sorting settings have changed in viewer2 from viewer1.23, this seems to be causing at least a couple of bugs. Fixed one, filing the other.
2010-03-04cycle6 DE JA xlation, new filesEli Linden
2010-03-04cycle6 DE JA xlation; beta 4 DE linguistic fixEli Linden
2010-03-04EXT-5919 Clean up fuzzy type in Buy L$Erica
2010-03-04PE merge.Tofu Linden