| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'mccabe/exp' into weekly | David Seikel | 2011-03-20 | 1 | -2/+25 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml | ||||
| | * | Fixed bad line endings (CRLF) in many files. | Jacek Antonelli | 2011-03-18 | 1 | -20/+20 |
| | | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future. | ||||
| | * | Merge in Var Sized Regions into the Imprudence Experimental. | RevolutionSmythe | 2011-03-18 | 1 | -2/+25 |
| | | | |||||
| * | | Missed some is_linden -> is_god conversions. | David Seikel | 2011-02-26 | 1 | -7/+7 |
| | | | |||||
| * | | Unbranding. Todays word is "linden". | David Seikel | 2011-02-25 | 1 | -12/+12 |
| |/ | |||||
| * | Add an UI for Display name settings to prefs general, make the setting more ↵ | Armin Weatherwax | 2011-01-25 | 1 | -1/+1 |
| | | | | | | | | intuitive instead: of 0 legacy only , 1 both and 2 display names only we use now: 0 legacy, 1 display names only and 2 both | ||||
| * | Henri Beauchamp: Display Names support v4 | Armin Weatherwax | 2011-01-24 | 1 | -0/+27 |
| | | |||||
| * | Rename hippo* files to lower case (PART 2 OF 2) | Aleric Inglewood | 2010-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | | There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming. | ||||
| * | Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵ | McCabe Maxsted | 2010-11-02 | 1 | -4/+4 |
| |\ | | | | | | | browser/media plugin support | ||||
| | * | Merge branch 'weekly' into webkit_plugins | Aleric Inglewood | 2010-10-22 | 1 | -40/+94 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed. | ||||
| | * \ | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 1 | -4/+4 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml | ||||
| | | * | | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Finishes the OpenRegionSettings module, adds a new panel to Region/Estate ↵ | RevolutionSmythe | 2010-11-01 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better. | ||||
| * | | | | #637: teleport target location in local chat, ported from Phoenix by ↵ | McCabe Maxsted | 2010-10-23 | 1 | -0/+56 |
| | |_|/ |/| | | | | | | | | Ansariel Hiller | ||||
| * | | | Ported profile button in friendship requests from Phoenix | McCabe Maxsted | 2010-10-16 | 1 | -0/+7 |
| | | | | |||||
| * | | | Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett | McCabe Maxsted | 2010-10-09 | 1 | -40/+87 |
| |/ / | |||||
| * | | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly | elektrahesse | 2010-10-01 | 1 | -21/+24 |
| |\ \ | |||||
| | * \ | Merge remote branch 'thickbrick/translate_fixes_b' into weekly | McCabe Maxsted | 2010-09-29 | 1 | -21/+24 |
| | |\ \ | |||||
| | | * | | Make chat translator ignore non-interesting translations (empty or same as | thickbrick | 2010-09-25 | 1 | -21/+24 |
| | | |/ | | | | | | | | | | original,) that may result from Google Translate's language autodetec failure. | ||||
| * | | | Fix for "about landmark" crash when invoking it on a freshly received landmark. | elektrahesse | 2010-09-30 | 1 | -1/+2 |
| |/ / | |||||
| * | | Ported gSavedSettings changes from Emerald (as well as modifying a few of ours) | McCabe Maxsted | 2010-09-25 | 1 | -1/+2 |
| | | | |||||
| * | | Double-click teleport: | thickbrick | 2010-09-21 | 1 | -1/+7 |
| |/ | | | | | | | - clean up duplicated (and subtly and needlessly different) code. - keep the camera heading in inter-sim double-click teleport in a hackish way, since SL sims give LookAt info that is kind of random in AgentMovementComplete. | ||||
| * | Updated the formatting for group IMs to make it clear they're IMs | McCabe Maxsted | 2010-09-10 | 1 | -2/+5 |
| | | |||||
| * | Ported use group name in chat feature from Emerald | McCabe Maxsted | 2010-09-10 | 1 | -1/+11 |
| | | |||||
| * | Applied #472: teleport history from Emerald, patch by Ansariel Hiler, ↵ | McCabe Maxsted | 2010-09-07 | 1 | -0/+11 |
| | | | | | feature originally by Zi Ree | ||||
| * | Made 'notify when currency spent or received' also chat the message | McCabe Maxsted | 2010-09-06 | 1 | -0/+4 |
| | | |||||
| * | added spellcheck + translation from Emerald Viewer. references to ↵ | Patrick Sapinski | 2010-08-30 | 1 | -2/+80 |
| | | | | | modularsystems.sl should be changed! | ||||
| * | Fixed windlight water/sky notecards opening the notecard preview window on ↵ | McCabe Maxsted | 2010-08-29 | 1 | -1/+8 |
| | | | | | creation | ||||
| * | Katharine Berry: More centralised .wl checks. | Armin Weatherwax | 2010-08-29 | 1 | -0/+0 |
| | | |||||
| * | Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e | McCabe Maxsted | 2010-08-19 | 1 | -20/+165 |
| | | |||||
| * | Applied patch for SNOW-636: parse links to maps.secondlife.com in chat as ↵ | McCabe Maxsted | 2010-08-10 | 1 | -0/+5 |
| | | | | | slurls (viewer2 slurl format) | ||||
| * | Added menu option for toggling IM auto-responses on/off underneath the Busy ↵ | McCabe Maxsted | 2010-08-07 | 1 | -166/+169 |
| | | | | | option | ||||
| * | Scratching an ooooold itch: added 'Gestures' slider and mute button to the ↵ | McCabe Maxsted | 2010-08-07 | 1 | -4/+19 |
| | | | | | audio controls | ||||
| * | Avatar sounds now don't disable when from a region above current maturity | McCabe Maxsted | 2010-08-07 | 1 | -6/+6 |
| | | |||||
| * | Added notification option to ignore all LightShare until you change regions. | Jacek Antonelli | 2010-08-01 | 1 | -0/+7 |
| | | |||||
| * | No longer reset Windlight settings after teleport. | Jacek Antonelli | 2010-08-01 | 1 | -6/+0 |
| | | | | | It was part of the LightShare changes, but it annoys people. | ||||
| * | fix: further objects are not rezzing after login. Reverts 362e10f6c08a68624ca6. | Armin Weatherwax | 2010-07-10 | 1 | -12/+8 |
| | | | | | 362e10f6c08a68624ca6 is a partial revert of the revert of cad41f1. | ||||
| * | Unreverted an OpenSim teleport fix from cad41f1. | Jacek Antonelli | 2010-06-26 | 1 | -8/+12 |
| | | | | | | | | Prevents the viewer from being told by OpenSim to teleport to the same region you are already in, which causes bad issues. It was reverted in 932dd4d but should have been kept. | ||||
| * | Partially reverted cad41f1 and 65a5856 to help login issues. | Jacek Antonelli | 2010-06-22 | 1 | -12/+8 |
| | | | | | | | | | This reverts (except for some parts): - Commit cad41f1ae08927737eca4cd9df25381d78e82304. "Fixed #338: addRegion/removeRegion can trigger a viewer quit" - Commit 65a5856f9567074886f28df59a26433c4b447576. "wip forcing region disconnects to log you out" | ||||
| * | Fixed #318 Crash in LLWindlightRemoteCtrl::refreshPresets() | McCabe Maxsted | 2010-06-19 | 1 | -5/+3 |
| | | |||||
| * | Fixed #338: addRegion/removeRegion can trigger a viewer quit | McCabe Maxsted | 2010-06-19 | 1 | -8/+12 |
| | | |||||
| * | Removed 'Received animation state for unknown avatar' log spam | McCabe Maxsted | 2010-06-19 | 1 | -1/+1 |
| | | |||||
| * | Rewrote the radar code to fix some basic issues | McCabe Maxsted | 2010-06-19 | 1 | -2/+11 |
| | | | | | | i.e. avatars stuck as typing, appearing multiple times, or spamming the chat notify (also added a ban button while I was there) | ||||
| * | Clarified the simulator version change chat message with some text | McCabe Maxsted | 2010-06-19 | 1 | -1/+3 |
| | | |||||
| * | Added some debug lines to llviewermessage for animations | McCabe Maxsted | 2010-06-19 | 1 | -1/+5 |
| | | |||||
| * | Applied patch for LightShare viewer-side implementation. | Jacek Antonelli | 2010-06-19 | 1 | -0/+9 |
| | | | | | Ported from Meta7 viewer by Armin. | ||||
| * | Ported IgnoreSimulatorCameraConstraints setting from Emerald | McCabe Maxsted | 2010-06-19 | 1 | -0/+4 |
| | | |||||
| * | Make server version change popup optional, also optionally chat it. | Armin Weatherwax | 2010-06-19 | 1 | -3/+14 |
| | | |||||
| * | Ported currency changes from Hippo (#237) and fixed some labels Hippo missed ↵ | McCabe Maxsted | 2010-04-26 | 1 | -10/+24 |
| | | | | | (also fixed #200 in the process) | ||||
| * | Fixed phantom avatar on Second Life | McCabe Maxsted | 2010-04-25 | 1 | -0/+2 |
| | | |||||
 |
index : meta-impy | |
| Metaverse (OpenSim/SL) viewer with an emphasis on usability. My attempt to keep up with 1.4 impy development. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |