aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* We don't need support for the aurora grid in the viewer for the meta 7 grid.David Seikel2011-03-202-17/+4
| | | | It seems like a waste of code anyway.
* Dunno how this file got missed.David Seikel2011-03-201-0/+16
|
* Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-20144-23139/+25157
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'jacek/exp' into expMcCabe Maxsted2011-03-1933-3813/+3942
| |\
| | * Package both libz.so.1 and libz.so (symlink) on Linux32. (IMP-790)Jacek Antonelli2011-03-191-1/+2
| | | | | | | | | | | | | | | The viewer binary links against libz.so, but libvivoxsdk.so and some other libraries link against libz.so.1.
| | * Merge remote-tracking branch 'armin/exp' into expJacek Antonelli2011-03-1924-33/+1043
| | |\
| | * | Fixed bad line endings (CRLF) in many files.Jacek Antonelli2011-03-1825-5529/+5529
| | | | | | | | | | | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
| | * | Fix a bug that only occurs when not running in a debugger.RevolutionSmythe2011-03-181-2/+1
| | | |
| | * | Fix setting the viewer offset time from OpenRegionSettings, and also have it ↵RevolutionSmythe2011-03-183-8/+22
| | | | | | | | | | | | | | | | show what UTC offset it is representing in the time bar.
| | * | Merge in Var Sized Regions into the Imprudence Experimental.RevolutionSmythe2011-03-1828-1708/+1823
| | | |
| * | | Merge remote-tracking branch 'armin/exp' into expMcCabe Maxsted2011-03-197-8/+8
| |\ \ \ | | | |/ | | |/|
| | * | less misleading wording for linux script messagesArmin Weatherwax2011-03-192-3/+3
| | | |
| | * | package libz.so instead of libz.so.1 for linux32Armin Weatherwax2011-03-191-1/+1
| | | |
| | * | only use vbo if availableArmin Weatherwax2011-03-182-2/+2
| | | |
| | * | fix currency in the german status bar button missingArmin Weatherwax2011-03-181-1/+1
| | | |
| | * | Fix Bug #799 german floater_pay_object.xml brokenArmin Weatherwax2011-03-181-1/+1
| | | |
| * | | Added a null check for corrupt volume listsMcCabe Maxsted2011-03-181-1/+1
| | | |
| * | | Fixed missing use_prebuilt_binary(gstreamer-plugins) from ↵McCabe Maxsted2011-03-151-3/+4
| | | | | | | | | | | | | | | | GStreamer010Plugin.cmake and fixed some out-of-date lib requirements for Windows
| * | | Don't use the build window keyboard shortcuts when the UI has focus (except ↵McCabe Maxsted2011-03-153-4/+30
| | | | | | | | | | | | | | | | for the chatbar)
| * | | Use a buffer for debug console output (improves speed on Windows when ↵McCabe Maxsted2011-03-143-2/+6
| | | | | | | | | | | | | | | | console is enabled). Ported from Singularity, patch by Shyotl
| * | | Added copy text button to Help > About Imprudence and tabbed the info. ↵McCabe Maxsted2011-03-143-54/+101
| | | | | | | | | | | | | | | | Ported from Singularity, patch by Siana Gearz
| * | | Fixed typo in 425b474McCabe Maxsted2011-03-141-1/+1
| | | |
| * | | Merge remote-tracking branch 'armin/exp' into expMcCabe Maxsted2011-03-1417-25/+1035
| |\ \ \ | | |/ /
| | * | Henri Beauchamps version of Sione Lomus media filter patch.Armin Weatherwax2011-03-1316-13/+1025
| | | | | | | | | | | | | | | | | | | | | | | | from http://sldev.free.fr/ : "MediaFilter_v3: based on code by Sione Lomu with a couple of bugfixes by Tonya Souther, this improved patch brings media and streaming audio URLs filtering (to prevent IP ripping by so-called security systems which violate the SL TOS by catching your IP and associating your various avatars with it, thus violating your anonimity). Beside empowering your viewer with allow/deny/blacklist/whitelist functions per domain, this improved patch makes the difference between external servers (domains names filtering) and in-world servers (scripted objects with built-in HTTP servers). I also fixed various bugs, security holes and shortcomings, refactored the code and improved it, and added a whitelist/blacklist erasing function." Imprudence changes: added "MediaFilter" debug to be able to inspect the full url and media texture uuid
| | * | fix voice doesn't kick in.Armin Weatherwax2011-03-131-12/+10
| | |/ | | | | | | | | | also fixed some LL_INFOS that should be LL_WARNS in the voice client.
| * | Added info message when cmake can't find the quicktime sdkMcCabe Maxsted2011-03-141-0/+2
| | |
| * | Added cmake files to the solution. This should've been done AGES agoMcCabe Maxsted2011-03-142-0/+149
| | |
| * | Forgot to include the licenses file in the artwork packageMcCabe Maxsted2011-03-141-1/+1
| | |
| * | Moved boost 1.43 libs to our serverMcCabe Maxsted2011-03-141-1/+1
| | |
| * | Added the newview/character directory to the repo. This'll make it easier to ↵McCabe Maxsted2011-03-1494-2/+18702
| |/ | | | | | | update
| * fix bogus in install.xmlArmin Weatherwax2011-03-111-3/+3
| |
| * Changed version to Experimental 2011.03.11McCabe Maxsted2011-03-111-1/+1
| |
| * moved the AO inventory preloading to a better place, a place where it ↵Patrick Sapinski2011-03-102-12/+13
| | | | | | | | | | | | actually works. Does anyone even read this? IF YOU SEE THIS TEXT YOU HAVE WON $500, MESSAGE ME TO COLLECT YOUR PRIZE.
| * fix for AO from EmeraldPatrick Sapinski2011-03-102-0/+12
| |
| * Merge remote-tracking branch 'armin/weekly' into weeklyMcCabe Maxsted2011-03-102-29/+47
| |\
| | * Tazy Scientist: Feature #759 Particle Chat EnhancedArmin Weatherwax2011-03-102-29/+47
| | | | | | | | | | | | | | | script is here: http://redmine.kokuaviewer.org/attachments/164/script.txt I (ArminW) added also a ParticleChatCannel setting to Tazys patch.
| * | Commented out more libs used only by GStreamer from Mac manifest.Jacek Antonelli2011-03-101-8/+8
| | | | | | | | | | | | | | | Since Mac is still using the Quicktime plugin, these libs aren't downloaded, so trying to package them makes viewer_manifest.py fail.
| * | Updated boost to 1.39 on Mac.Jacek Antonelli2011-03-101-2/+2
| | |
| * | Fixed some bad indentation in viewer_manifest.py.Jacek Antonelli2011-03-101-60/+60
| | |
| * | Replaced old 1.3.x Windows gstreamer files with new files for 1.4. Note that ↵McCabe Maxsted2011-03-101-70/+55
| | | | | | | | | | | | this also replaces glib, iconv, and libxml
| * | Updated copywinlibs and staging to use the new set of gstreamer libsMcCabe Maxsted2011-03-092-58/+192
| | |
| * | #713: add a ossl osUnixTimeToTimestamp() function for syntax highlighting, ↵McCabe Maxsted2011-03-091-0/+1
| | | | | | | | | | | | patch by tx Oh
| * | IMP-775 Correct spaces in NSIS call. Reference VWR-20742.Nicky Perian2011-03-091-3/+8
| | | | | | | | | | | | | | | | | | Used, with permission, Siana Geraz's Singularity Viewer portion related to this issue only. Signed-off-by: Nicky Perian <nickyperian@yahoo.com>
| * | Stage dictionaries directoryNicky Perian2011-03-092-0/+4
| | |
| * | Fixed play button disappearing when you play streaming audioMcCabe Maxsted2011-03-091-7/+7
| | |
| * | Fixed being unable to change streaming audio volume on WindowsMcCabe Maxsted2011-03-091-1/+2
| | |
| * | Merge remote-tracking branch 'jacek/weekly' into weeklyMcCabe Maxsted2011-03-092-3/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py
| | * \ Merge remote-tracking branch 'mccabe/weekly' into weeklyJacek Antonelli2011-03-0623-141/+395
| | |\ \
| | * | | Don't try to package RELEASE_NOTES.txt, it doesn't exist for Experimentals.Jacek Antonelli2011-03-041-1/+0
| | | | |
| | * | | Fixed Linux compile warnings in media_plugin_gstreamer010.cpp.Jacek Antonelli2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning was because writeToLog expected a char pointer, but was being given string constants. Exact warning message was: deprecated conversion from string constant to ‘char*’