Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'exp' of github.com:onefang/meta-impy into libotr | Jay Threeth | 2011-04-02 | 8 | -3/+1461 |
|\ | |||||
| * | Push some of the trivial changes from the accountList branch. | David Seikel | 2011-04-03 | 3 | -1/+17 |
| | | | | | | | | Should not change anything, and there will be more to come. | ||||
| * | Apparently the SDL pre built library has different version of these. | David Seikel | 2011-04-02 | 3 | -0/+0 |
| | | | | | | | | | | Some of them are things I would have to replace later for the meta branding. But to stop in tree builds from bitching, for now use the ones from the pre build. | ||||
| * | Get the client tags from our own servers. Also, added the file for future ↵ | David Seikel | 2011-03-28 | 2 | -2/+1444 |
| | | | | | | | | reference. | ||||
* | | checkpoint, non functional | Jay Threeth | 2011-04-02 | 9 | -4/+1187 |
|/ | |||||
* | Test BEFORE you commit. Doh! I blame python and it's stupid "white space is ↵ | David Seikel | 2011-03-27 | 1 | -19/+19 |
| | | | | a significant language token" policy. | ||||
* | Turn on the linux tarball generation again. Add a comment that we need a ↵ | David Seikel | 2011-03-27 | 1 | -20/+21 |
| | | | | way to turn that on and off. | ||||
* | Oops, fix the beta grid details. | David Seikel | 2011-03-27 | 1 | -2/+2 |
| | |||||
* | Removed some spaces. | David Seikel | 2011-03-21 | 1 | -2/+2 |
| | |||||
* | Grr, try this post merge fixup again. | David Seikel | 2011-03-20 | 1 | -158/+32 |
| | |||||
* | These two files got stomped all over when they where converted to unix line ↵ | David Seikel | 2011-03-20 | 2 | -24/+3 |
| | | | | endings, so re-apply my changes. | ||||
* | Um, Windows get's it's own README file coz it's special? Just make it the ↵ | David Seikel | 2011-03-20 | 1 | -40/+64 |
| | | | | same, maybe try to clean it out later. | ||||
* | Caught a typo. | David Seikel | 2011-03-20 | 1 | -1/+1 |
| | |||||
* | We don't need support for the aurora grid in the viewer for the meta 7 grid. | David Seikel | 2011-03-20 | 2 | -17/+4 |
| | | | | It seems like a waste of code anyway. | ||||
* | Dunno how this file got missed. | David Seikel | 2011-03-20 | 1 | -0/+16 |
| | |||||
* | Merge remote-tracking branch 'mccabe/exp' into weekly | David Seikel | 2011-03-20 | 146 | -34594/+25159 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 exp | McCabe Maxsted | 2011-03-19 | 33 | -3813/+3942 |
| |\ | |||||
| | * | Package both libz.so.1 and libz.so (symlink) on Linux32. (IMP-790) | Jacek Antonelli | 2011-03-19 | 1 | -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 exp | Jacek Antonelli | 2011-03-19 | 24 | -33/+1043 |
| | |\ | |||||
| | * | | Fixed bad line endings (CRLF) in many files. | Jacek Antonelli | 2011-03-18 | 25 | -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. | RevolutionSmythe | 2011-03-18 | 1 | -2/+1 |
| | | | | |||||
| | * | | Fix setting the viewer offset time from OpenRegionSettings, and also have it ↵ | RevolutionSmythe | 2011-03-18 | 3 | -8/+22 |
| | | | | | | | | | | | | | | | | show what UTC offset it is representing in the time bar. | ||||
| | * | | Merge in Var Sized Regions into the Imprudence Experimental. | RevolutionSmythe | 2011-03-18 | 28 | -1708/+1823 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'armin/exp' into exp | McCabe Maxsted | 2011-03-19 | 7 | -8/+8 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | less misleading wording for linux script messages | Armin Weatherwax | 2011-03-19 | 2 | -3/+3 |
| | | | | |||||
| | * | | package libz.so instead of libz.so.1 for linux32 | Armin Weatherwax | 2011-03-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | only use vbo if available | Armin Weatherwax | 2011-03-18 | 2 | -2/+2 |
| | | | | |||||
| | * | | fix currency in the german status bar button missing | Armin Weatherwax | 2011-03-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix Bug #799 german floater_pay_object.xml broken | Armin Weatherwax | 2011-03-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added a null check for corrupt volume lists | McCabe Maxsted | 2011-03-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed missing use_prebuilt_binary(gstreamer-plugins) from ↵ | McCabe Maxsted | 2011-03-15 | 1 | -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 Maxsted | 2011-03-15 | 3 | -4/+30 |
| | | | | | | | | | | | | | | | | for the chatbar) | ||||
| * | | | Use a buffer for debug console output (improves speed on Windows when ↵ | McCabe Maxsted | 2011-03-14 | 3 | -2/+6 |
| | | | | | | | | | | | | | | | | console is enabled). Ported from Singularity, patch by Shyotl | ||||
| * | | | Added copy text button to Help > About Imprudence and tabbed the info. ↵ | McCabe Maxsted | 2011-03-14 | 3 | -54/+101 |
| | | | | | | | | | | | | | | | | Ported from Singularity, patch by Siana Gearz | ||||
| * | | | Fixed typo in 425b474 | McCabe Maxsted | 2011-03-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'armin/exp' into exp | McCabe Maxsted | 2011-03-14 | 17 | -25/+1035 |
| |\ \ \ | | |/ / | |||||
| | * | | Henri Beauchamps version of Sione Lomus media filter patch. | Armin Weatherwax | 2011-03-13 | 16 | -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 Weatherwax | 2011-03-13 | 1 | -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 sdk | McCabe Maxsted | 2011-03-14 | 1 | -0/+2 |
| | | | |||||
| * | | Added cmake files to the solution. This should've been done AGES ago | McCabe Maxsted | 2011-03-14 | 2 | -0/+149 |
| | | | |||||
| * | | Forgot to include the licenses file in the artwork package | McCabe Maxsted | 2011-03-14 | 1 | -1/+1 |
| | | | |||||
| * | | Moved boost 1.43 libs to our server | McCabe Maxsted | 2011-03-14 | 1 | -1/+1 |
| | | | |||||
| * | | Added the newview/character directory to the repo. This'll make it easier to ↵ | McCabe Maxsted | 2011-03-14 | 95 | -388/+7633 |
| |/ | | | | | | | update | ||||
| * | fix bogus in install.xml | Armin Weatherwax | 2011-03-11 | 1 | -3/+3 |
| | | |||||
| * | Changed version to Experimental 2011.03.11 | McCabe Maxsted | 2011-03-11 | 1 | -1/+1 |
| | | |||||
| * | moved the AO inventory preloading to a better place, a place where it ↵ | Patrick Sapinski | 2011-03-10 | 2 | -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 Emerald | Patrick Sapinski | 2011-03-10 | 2 | -0/+12 |
| | | |||||
| * | Merge remote-tracking branch 'armin/weekly' into weekly | McCabe Maxsted | 2011-03-10 | 2 | -29/+47 |
| |\ | |||||
| | * | Tazy Scientist: Feature #759 Particle Chat Enhanced | Armin Weatherwax | 2011-03-10 | 2 | -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 Antonelli | 2011-03-10 | 1 | -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. |