summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-06-30MergeLogan Dethrow
2011-06-30STORM-1112 Rearranged proxy preferences panels.Logan Dethrow
2011-06-30merge changes for storm-1452Oz Linden
2011-06-30merge changes for storm-1406Oz Linden
2011-06-30merge changes for storm-1327Oz Linden
2011-06-30merge changes for storm-1396Oz Linden
2011-06-30merge changes for storm-457Oz Linden
2011-06-29merge changes for storm-1423Oz Linden
2011-06-29merge changes for storm-1392Oz Linden
2011-06-29Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-06-29merge changes for storm-1302Oz Linden
2011-06-29merge changes for storm-1326Oz Linden
2011-06-29merge changes for storm-1292Oz Linden
2011-06-29storm-1454Oz Linden
2011-06-29merge changes for storm-1439Oz Linden
2011-06-29merge changes for storm-1352Oz Linden
2011-06-28STORM-1112 More cleanup of SOCKS 5 proxy code.Logan Dethrow
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-28STORM-1334: compute area using integer math to avoid type conflictOz Linden
2011-06-28merge changes for storm-1103Oz Linden
2011-06-28merge changes for storm-323Oz Linden
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-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-1444: Disable mesh loadingNyx (Neal Orman)
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 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-24automated mergeRoxie Linden
2011-06-24sync with viewer-developmenteli_linden
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-23merge changes for storm-899Oz Linden
2011-06-23merge changes for storm-1437Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-18 05:27:22 +0000