aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnextDavid Walter Seikel2014-02-03440-2425/+4492
|\
| * Fix up OTR prefs to not crash.David Walter Seikel2013-09-021-2/+2
| | | | | | | | No idea how this managed to work before.
| * More post merge cleanups, make it compile under Windows.David Walter Seikel2013-09-027-6/+33
| |
| * Merge post fixes so that Linux compiles.David Walter Seikel2013-09-017-41/+43
| | | | | | | | Windows is being a pig, will take a while.
| * Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-30430-2380/+4418
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| | * Merge remote-tracking branch 'origin/next' into WL-refactorDavid Walter Seikel2013-07-15150-1437/+3379
| | |\
| | | * Fix Align tool conflicts with Edit Linked Parts - ↵David Walter Seikel2013-05-258-70/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://redmine.kokuaviewer.org/issues/948 The new hot keys are - Ctrl-Shift-P for position (Ctrl-Alt-P was taken). Ctrl-Alt-F for face selection. Ctrl-Alt-M for align, and Ctrl-Alt-Shift-M for pack. Also fixed things so they all work all the time, and refactored common code.
| | | * White space cleanups.David Walter Seikel2013-05-252-20/+14
| | | |
| | | * Dump hotkeys for obscure debugging stuff, to free them up for other things.David Walter Seikel2013-05-252-14/+8
| | | |
| | | * White space fix.David Walter Seikel2013-05-251-1/+1
| | | |
| | | * Resorted the grid list file.David Walter Seikel2013-05-151-15/+15
| | | |
| | | * Updated New World Grid details, at their request.David Walter Seikel2013-05-151-8/+8
| | | |
| | | * Allow visual studio express builds from develop.py command line - ↵David Walter Seikel2013-05-141-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | http://redmine.kokuaviewer.org/issues/711 A few additions to the previous nmake work, from Robin Cornelius.
| | | * Clean out no longer needed commented code.David Walter Seikel2013-05-131-4/+0
| | | |
| | | * Update the basic graphics detail slider.David Seikel2013-05-138-226/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them. And looks like they left crap laying around from the old method. Removed the crap. Updated the values the slider uses to better suit modern equipment, while leaving the low end the same. Pumped up "linden" tree rendering, it was way too low.
| | | * Add new communication channel urls to the viewer's Help menu - ↵David Walter Seikel2013-05-134-36/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://redmine.kokuaviewer.org/issues/867 Also removed forums and blog links, since they are part of the comms channels page, but added bug reporting link.
| | | * Add 'Show hidden selection' to advanced build options - ↵David Walter Seikel2013-05-123-10/+48
| | | | | | | | | | | | | | | | | | | | | | | | http://redmine.kokuaviewer.org/issues/606 Also added the other "Show x" from the Tools menu, and sorted that part of the menu into alphabetical order.
| | | * Fix - Did not register secondlife:// handler with KDE - ↵David Walter Seikel2013-05-121-10/+11
| | | | | | | | | | | | | | | | http://redmine.kokuaviewer.org/issues/1068
| | | * Fix Inventory "Cut" and "Paste" deletes inventory item instead of moving it, ↵David Walter Seikel2013-05-122-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://redmine.kokuaviewer.org/issues/961 Instead of copying something, then trying to delete the original, which was happening before the copy hit the sim server, just move it to a different folder like drag and drop does.
| | | * White space fixes.David Walter Seikel2013-05-121-7/+7
| | | |
| | | * White space fixups.David Walter Seikel2013-05-111-3/+3
| | | |
| | | * Add descriptive text for the face select tool.David Walter Seikel2013-05-113-0/+5
| | | | | | | | | | | | | | | | It was missing any, and ended up with text from the last tool selected.
| | | * Fix http://redmine.kokuaviewer.org/issues/944 - Shadow Frustra missing from ↵David Walter Seikel2013-05-112-1/+10
| | | | | | | | | | | | | | | | Advanced Menu > Rendering > Info Display
| | | * Update boost on Linux to 1.52.David Walter Seikel2013-05-022-37/+32
| | | | | | | | | | | | | | | | Mac and Windows will be done when I can test them better.
| | | * Add more credits, including my own.David Walter Seikel2013-05-021-3/+3
| | | |
| | | * Fix Windows autobuild support, coz it's different from the others. sighDavid Walter Seikel2013-04-271-0/+3
| | | |
| | | * Make sure the TYPE variable is actually defined for nmake builds.David Walter Seikel2013-04-261-1/+3
| | | |
| | | * Merge branch 'nmake' into nextDavid Walter Seikel2013-04-2619-210/+215
| | | |\ | | | | | | | | | | | | | | | nmake builds seem stable now.
| | | | * Ah, iss has different UUIDs for release and experimentals.David Walter Seikel2013-04-261-1/+1
| | | | |
| | | | * Make nmake builds more like VS builds.David Walter Seikel2013-04-2611-60/+73
| | | | | | | | | | | | | | | | | | | | Still some tweaking to go, therefore, still some rough bits in this.
| | | | * Small clean ups.David Walter Seikel2013-04-201-6/+4
| | | | |
| | | | * Do the right vs finding thing even if it's an nmake build.David Walter Seikel2013-04-201-11/+14
| | | | |
| | | | * Revert part of an earlier commit, no need to treat nmake differently for ↵David Walter Seikel2013-04-201-3/+1
| | | | | | | | | | | | | | | | | | | | this bit.
| | | | * Remove more excess vs finding output.David Walter Seikel2013-04-201-1/+0
| | | | |
| | | | * Remove excess output from the vs finding code, and move it up in the file.David Walter Seikel2013-04-201-45/+35
| | | | |
| | | | * Cmake now puts the running of vstool into the make files for us, so no need ↵David Walter Seikel2013-04-201-19/+0
| | | | | | | | | | | | | | | | | | | | to do it in python.
| | | | * No need to run cmake twice, the user gets warned if they screw up.David Walter Seikel2013-04-201-1/+0
| | | | |
| | | | * Make python output stuff in the proper order.David Walter Seikel2013-04-201-0/+4
| | | | |
| | | | * Allow the build scripts to build a configurable type, and make that type ↵David Walter Seikel2013-04-193-2/+4
| | | | | | | | | | | | | | | | | | | | RelWithDebInfo.
| | | | * Bump experimental version number.David Walter Seikel2013-04-194-7/+7
| | | | |
| | | | * New branch for building with nmake.David Walter Seikel2013-04-188-72/+90
| | | | | | | | | | | | | | | | | | | | This is a branch, coz it's still crap.
| | | * | Update boost library for Linux 64 bit to 1.48 from Kokua.David Walter Seikel2013-04-242-2/+42
| | | | | | | | | | | | | | | | | | | | Also added icu from there, but not sure it's needed anymore?
| | | * | Add compatibility with autobuild pre built libraries.David Walter Seikel2013-04-241-0/+38
| | | | | | | | | | | | | | | | | | | | Now Imprudence can share them with Kokua.
| | | * | Fix http://redmine.kokuaviewer.org/issues/1139 and provide better protection ↵David Walter Seikel2013-04-211-8/+9
| | | |/ | | | | | | | | | | | | against NULL callbacks.
| | | * Potential fix for http://redmine.kokuaviewer.org/issues/1215 but needs testing.David Walter Seikel2013-04-171-1/+2
| | | |
| | | * Attempt to fix up Windows yyparse issue, but ultimately fail, then notice ↵David Walter Seikel2013-04-171-7/+17
| | | | | | | | | | | | | | | | it's possibly not being used anyway, so just commit it.
| | | * Use unix style bison build for cygwin.David Walter Seikel2013-04-171-3/+3
| | | |
| | | * Fix up Windows installer, and make it more consistant with other OSes.David Walter Seikel2013-04-172-11/+13
| | | |
| | | * Random white space clean ups. In Python! Yes, be scared. B-)David Walter Seikel2013-04-171-9/+5
| | | |
| | | * Better cache directory code for pre built libraries.David Walter Seikel2013-04-171-4/+4
| | | |