summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-06-28merge changes for vwr-25480Oz Linden
2011-06-28merge changes for storm-1393Oz Linden
2011-06-28merge changes for storm-1334Oz Linden
2011-06-28merge changes for late beta fixesOz Linden
2011-06-28CHOP-753: suppress VS fatal warning 4355Nat Goodspeed
2011-06-28CHOP-753: Log LLMemoryInfo whenever framerate hits a new low.Nat Goodspeed
Introduce FrameWatcher, a static object that hooks into the LLEventPump named "mainloop" to get a call every frame. Track framerate over a defined sample time (20 seconds atm); track minimum and log LLMemoryInfo every time we hit a new minimum.
2011-06-28STORM-1452 Debug settings -- TRUE/FALSE name (not label) translated in ↵Tankmaster Finesmith
foreign languages with help from Jonathan Yap
2011-06-27FIX VWR-25681eli_linden
2011-06-27FIX VWR-25943 en_xui_changeeli_linden
2011-06-27FIX VWR-25881eli_linden
2011-06-27FIX VWR-25880eli_linden
2011-06-27FIX VWR-25879eli_linden
2011-06-27FIX VWR-25660eli_linden
2011-06-27STORM-1446 Portability fix when setting non-blocking socket options.Aaron Stone
2011-06-27storm-1444: Disable mesh loadingNyx (Neal Orman)
2011-06-27SH-1897 Don't use GLSL 1.20 unless the GL version is >= 2.1fDave Parks
2011-06-27increment viewer version to 2.7.6Oz Linden
2011-06-27STORM-457 There is no space char after [AGENT_NAME] in ↵Jonathan Yap
'conference-title-incoming' for Japanese language
2011-06-26STORM-1406 [ENG LAYOUT] Viewer - Overlapping text in Input/Output devices ↵Alexandrea Fride
preference with help from Jonathan Yap
2011-06-26STORM-1103 sets a minimum size for map in nearby people and makes the map ↵Twisted_Laws
resizable
2011-06-26STORM-1327 MULTIPLE LANGS (Spanish/German) [FORMATTING] Overlapped text in ↵Alexandrea Fride
About Land Window when the land is for sell: "Los objetos se incluyen en la venta" With help from Jonathan Yap
2011-06-26merge changes for latest viewer-developmentOz Linden
2011-06-26merge changes for storm-1443Oz Linden
2011-06-25STORM-1292 [UNTRANSLATABLE XUI ATTRIBUTE] "Mi apariencia" tab in side menu ↵Jonathan Yap
bar > "MIS VESTUARIOS". You don't have any outfits yet. Try Search. (ALL LANGS)
2011-06-25STORM-1302 (all langs) [TRANSLATED BUT IN ENG] (Spanish) Side Menu > Gente ↵Jonathan Yap
tab > MIS AMIGOS tab > buttons "Call", "Share" and "Teleport" and their tooltips
2011-06-25STORM-1326 [ALL LANGS] (Spanish) [HARDCODED] Selling land, advice with ↵Jonathan Yap
"Anyone" in English.
2011-06-24SH-1903 Fix for silly shader compiler error.Dave Parks
2011-06-24automated mergeRoxie Linden
2011-06-24sync with viewer-developmenteli_linden
2011-06-24CHOP-753: add timestamp and <mem> marker to memory stats log linesNat Goodspeed
2011-06-23SH-1903 Don't use indexed texture rendering when GL version is < 3.1 (fixes ↵Dave Parks
bad performance on cards with old drivers)
2011-06-23FIX VWR-25660 en_xui_changeeli_linden
2011-06-23FIX VWR-25408eli_linden
2011-06-23FIX VWR-25400eli_linden
2011-06-23FIX VWR-25381eli_linden
2011-06-23FIX VWR-25125eli_linden
2011-06-23automated mergeRoxie Linden
2011-06-23Fix for VOICE-3 [crashhunters] LLVoiceVoiceClient::stateMachineRoxie Linden
Race condition with parcel changing while shutting down. If a parcel changes, we went into code that requests the cap for the new parcel voice channel info. This happened in any state, not the two states where it is really appropriate. stateRunning or stateNoSession. When shutting down, we may be in stateTerminate, stateLeavingSession, or so on, and we don't want to muck with getting caps and such during that time.
2011-06-23Log enriched memory info for Mac too.Nat Goodspeed
Add Mac logic to LLMemoryInfo::stream(): run vm_stat and log its output. Add comments with Mac and Linux suggestions to LLMemoryInfo::getAvailableMemoryKB(), responding to comment: //do not know how to collect available memory info for other systems.
2011-06-23merge changes for storm-899Oz Linden
2011-06-23merge changes for storm-1437Oz Linden
2011-06-22mergeDave Parks
2011-06-22SH-1848 Integrate changeset to fix typo in shader name preventing shadows ↵Dave Parks
being enabled while anti-aliasing is on on platforms where filenames are case sensitive.
2011-06-22merge another batch of changes from windlight integration repoOz Linden
2011-06-22STORM-1305 WIP UI changes in the Edit Water Preset floater.Vadim ProductEngine
- Made the floater smaller. - Removed the "Control Help" label. - Removed the view border, added a horizontal separator. - Fixed the color swatch to only handle mouse within the color box.
2011-06-22STORM-1305 WIP Fixed texture control to not display hand cursor outside of ↵Vadim ProductEngine
the texture. Also click outside of the texture will not show the picker anymore.
2011-06-22correct linux compilation problem in lldrawpoolwlskyOz Linden
2011-06-22merge latest viewer-developmentOz Linden
2011-06-22STORM-1305 WIP UI changes in the Day Cycle Editor.Vadim ProductEngine
- Made the floater smaller. - Removed the "Control Help" label. - Removed the view border, added a horizontal separator. - Added missing vertical line above the rightmost "12 am" label.
2011-06-22merge changes for storm-1421Oz Linden