Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed line endings on hippo and grid manager files. | Jacek Antonelli | 2009-09-10 | 9 | -1080/+1080 |
| | |||||
* | Merged 'armin/grid-manager5' into login-manager | Jacek Antonelli | 2009-09-10 | 64 | -488/+3884 |
|\ | | | | | | | | | | | Conflicts: linden/indra/newview/CMakeLists.txt linden/indra/newview/llpanellogin.cpp | ||||
| * | looks like working now | Armin Weatherwax | 2009-07-11 | 3 | -41/+61 |
| | | | | | | | | | | | | modified: linden/indra/newview/llchatbar.cpp modified: linden/indra/newview/llviewerwindow.cpp modified: linden/indra/newview/llvoavatar.cpp | ||||
| * | Broken: relog sometimes works once; fixed inventory and avatar not ruthed ↵ | Armin Weatherwax | 2009-07-11 | 7 | -5/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore. deleted: Imprudence.log modified: linden/indra/newview/llagent.cpp modified: linden/indra/newview/llappviewer.cpp modified: linden/indra/newview/llinventorymodel.cpp modified: linden/indra/newview/llinventorymodel.h modified: linden/indra/newview/llinventoryview.cpp modified: linden/indra/newview/llviewerjointattachment.h modified: linden/indra/newview/llviewermenu.cpp deleted: mAttachedObject.diff.txt deleted: meerkat-llmenugl.diff.txt deleted: meerkat-message.diff.txt deleted: meerkat-pipeline.cpp.diff.txt deleted: meerkat-voice.diff.txt deleted: stack_trace.log | ||||
| * | BROKEN now consistantly crashes at startup STATE_PRECACHE | Armin Weatherwax | 2009-07-11 | 1 | -0/+1 |
| | | |||||
| * | BROKEN logoff/relog crashing inconsistently on various startup states. | Armin Weatherwax | 2009-07-11 | 53 | -440/+3793 |
| | | |||||
| * | Updated URL for Mac OpenAL libs package. | Jacek Antonelli | 2009-07-11 | 1 | -1/+1 |
| | | |||||
* | | Commented out Linux tarball building. | Jacek Antonelli | 2009-09-09 | 1 | -20/+22 |
| | | | | | | | | It's a waste of time to package after every compile. | ||||
* | | Merge remote branch 'mccabe/1.2.0-next' into next | Jacek Antonelli | 2009-09-09 | 66 | -1179/+2513 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Moved "Backup" pie menu item to fit "Go Here" in top-left slot. Conflicts: linden/indra/newview/llviewermenu.cpp linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | ||||
| * | | Commented out permissions button (todo: backport this if there's time) | McCabe Maxsted | 2009-09-09 | 1 | -2/+2 |
| | | | |||||
| * | | New chat channel preference should change only on apply | McCabe Maxsted | 2009-09-09 | 2 | -18/+15 |
| | | | |||||
| * | | Created my own version of Emerald's chat channel tool | McCabe Maxsted | 2009-09-09 | 10 | -17/+132 |
| | | | |||||
| * | | Applied and tweaked last owner in tools window from Emerald viewer | McCabe Maxsted | 2009-09-07 | 3 | -36/+54 |
| | | | |||||
| * | | Fixed tool brush size | McCabe Maxsted | 2009-09-07 | 5 | -18/+46 |
| | | | |||||
| * | | Merge branch '1.2.0-toolslayout' into 1.2.0-emerald | McCabe Maxsted | 2009-09-07 | 5 | -156/+111 |
| |\ \ | |||||
| | * | | Fixed tree/grass label not hiding | McCabe Maxsted | 2009-09-04 | 1 | -3/+4 |
| | | | | |||||
| | * | | Integrated 1.23's tool floater with link/unlink buttons | McCabe Maxsted | 2009-09-04 | 5 | -153/+107 |
| | | | | |||||
| * | | | Fixed ground sit menu entry missing check | McCabe Maxsted | 2009-09-07 | 2 | -0/+18 |
| | | | | |||||
| * | | | Fixed reference to missing colors.xml entry | McCabe Maxsted | 2009-09-06 | 1 | -4/+4 |
| | | | | |||||
| * | | | Added LLScrollListCtrl::getSelectedIDs() | McCabe Maxsted | 2009-09-06 | 2 | -0/+13 |
| | | | | |||||
| * | | | Added Emerald viewer's asset browser | McCabe Maxsted | 2009-09-06 | 6 | -3/+627 |
| | | | | |||||
| * | | | Added Emerald viewer's animation list | McCabe Maxsted | 2009-09-06 | 6 | -0/+637 |
| | | | | |||||
| * | | | Start fetching inventory at startup | McCabe Maxsted | 2009-09-06 | 1 | -0/+4 |
| | | | | |||||
| * | | | Ported phantom avatar option from Emerald viewer | McCabe Maxsted | 2009-09-06 | 5 | -1/+80 |
| | | | | |||||
| * | | | Ported sit anywhere feature from Emerald viewer | McCabe Maxsted | 2009-09-06 | 2 | -0/+32 |
| |/ / | |||||
| * | | fix NDOF linking issues when using cmake 2.6 on linux | Armin Weatherwax | 2009-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | modified: linden/indra/newview/CMakeLists.txt (cherry picked from commit 9d14c7ab5c7519a4188c89b2ddeb8df30d858705) | ||||
| * | | Added 'Go Here' to object pie menu | McCabe Maxsted | 2009-09-04 | 1 | -1/+3 |
| | | | |||||
| * | | Teleport by double clicking into the viewer window. Port and bugfix of cv ↵ | Armin Weatherwax | 2009-09-04 | 3 | -22/+42 |
| | | | | | | | | | | | | | | | | | | port of emerald greenlife viewer feature. TODO: find a nice place in prefs to switch off (defaults to on). (cherry picked from commit 86e186e40f6a128abab1c3a44f33520508b37f16) | ||||
| * | | Linux middle mouse button paste/primary selection support and gtk clipboard ↵ | Armin Weatherwax | 2009-09-04 | 24 | -917/+696 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handler (fixes crashbug using synergy mouse-keyboard-clipboard-sharing over lan) modified: linden/doc/contributions.txt modified: linden/indra/llui/llclipboard.cpp modified: linden/indra/llui/llclipboard.h modified: linden/indra/llui/llfloater.cpp modified: linden/indra/llui/llfloater.h modified: linden/indra/llui/lllineeditor.cpp modified: linden/indra/llui/lllineeditor.h modified: linden/indra/llui/lltexteditor.cpp modified: linden/indra/llui/lltexteditor.h modified: linden/indra/llui/llview.cpp modified: linden/indra/llui/llview.h modified: linden/indra/llwindow/CMakeLists.txt new file: linden/indra/llwindow/llmousehandler.cpp modified: linden/indra/llwindow/llmousehandler.h modified: linden/indra/llwindow/llwindow.cpp modified: linden/indra/llwindow/llwindow.h modified: linden/indra/llwindow/llwindowsdl.cpp modified: linden/indra/llwindow/llwindowsdl.h modified: linden/indra/newview/lltool.cpp modified: linden/indra/newview/lltool.h modified: linden/indra/newview/llviewertexteditor.cpp modified: linden/indra/newview/llviewertexteditor.h modified: linden/indra/newview/llviewerwindow.cpp modified: linden/indra/newview/llviewerwindow.h (cherry picked from commit 594f4830922f4294dda432fa748935adffaeed8f) | ||||
| * | | Rebranded startup loading page to Imprudence | McCabe Maxsted | 2009-09-04 | 2 | -1/+1 |
| | | | |||||
| * | | Fixed inability to minimize chat history | McCabe Maxsted | 2009-09-04 | 1 | -1/+1 |
| | | | |||||
| * | | Updated GStreamer and Zlib windows libs | McCabe Maxsted | 2009-09-04 | 2 | -6/+14 |
| | | | |||||
| * | | Merged in jacek/next | McCabe Maxsted | 2009-09-04 | 5 | -13/+43 |
| |\ \ | |||||
| * | | | Fixed CMake not finding GLib on windows | McCabe Maxsted | 2009-08-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed OpenAL CMake error | McCabe Maxsted | 2009-08-29 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'objectbackup' into next | Jacek Antonelli | 2009-09-05 | 9 | -15/+1430 |
|\ \ \ | |||||
| * | | | Updated object backup feature to Meerkat's SVN, imported floater. | Jacek Antonelli | 2009-09-03 | 3 | -7/+17 |
| | | | | |||||
| * | | | Fixed some compiler warnings in primbackup.cpp. | Jacek Antonelli | 2009-09-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Applied object import/export patch. | Jacek Antonelli | 2009-09-03 | 8 | -15/+1420 |
| | | | | |||||
* | | | | Converted RLVa menu items to XUI. | Jacek Antonelli | 2009-09-05 | 2 | -0/+93 |
| | | | | |||||
* | | | | Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch. | Jacek Antonelli | 2009-09-04 | 85 | -128/+8502 |
| |_|/ |/| | | | | | | | | Made a few non-functional changes to help it apply. | ||||
* | | | Backported 1.23 fix for animation joint assertion crash. | Jacek Antonelli | 2009-09-03 | 1 | -2/+35 |
|/ / | |||||
* | | Updated some python scripts to not use deprecated modules. | Jacek Antonelli | 2009-09-03 | 3 | -10/+7 |
| | | |||||
* | | Merge branch 'mac-openal-url' into next | Jacek Antonelli | 2009-06-29 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Updated URL for Mac OpenAL libs package. | Jacek Antonelli | 2009-06-29 | 1 | -1/+1 |
| | | |||||
* | | Online/Offline notifications now always show in IM windows | McCabe Maxsted | 2009-06-14 | 1 | -21/+18 |
| | | |||||
* | | Added IM preference for showing IMs in either main or local chat | McCabe Maxsted | 2009-06-14 | 4 | -37/+62 |
| | | |||||
* | | use openjpeg 1.3 also for Linux | Armin Weatherwax | 2009-06-13 | 2 | -20/+6 |
| | | | | | | | | | | modified: linden/indra/newview/viewer_manifest.py modified: linden/install.xml | ||||
* | | Applied Aimee's patch for VWR-12631: setting to adjust the maximum size of ↵ | McCabe Maxsted | 2009-06-13 | 3 | -5/+16 |
| | | | | | | | | objects displayed on the minimap (MiniMapPrimMaxRadius) | ||||
* | | Applied Aimee's patch for VWR-4106: Mini-map beacon icon doesn't display ↵ | McCabe Maxsted | 2009-06-13 | 2 | -7/+11 |
| | | | | | | | | correctly when beacon position above or below camera |