Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gridmanager' into next | Jacek Antonelli | 2009-09-26 | 1 | -8/+10 |
|\ | |||||
| * | Cleaned up channel control code in llchatbar.cpp some | McCabe Maxsted | 2009-09-25 | 1 | -8/+10 |
| | | |||||
| * | Temporarily disable chat channel control in chat history until it's fixed | McCabe Maxsted | 2009-09-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'next' into login-manager | Jacek Antonelli | 2009-09-23 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: linden/indra/newview/llinventorymodel.cpp linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml | ||||
| * | Merged in jacek/next | McCabe Maxsted | 2009-09-14 | 1 | -3/+73 |
| | | |||||
| * | Removed old comment | McCabe Maxsted | 2009-09-09 | 1 | -1/+1 |
| | | |||||
* | | Merged 'armin/grid-manager5' into login-manager | Jacek Antonelli | 2009-09-10 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/CMakeLists.txt linden/indra/newview/llpanellogin.cpp | ||||
| * | | looks like working now | Armin Weatherwax | 2009-07-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | modified: linden/indra/newview/llchatbar.cpp modified: linden/indra/newview/llviewerwindow.cpp modified: linden/indra/newview/llvoavatar.cpp | ||||
* | | | Merge remote branch 'mccabe/1.2.0-next' into next | Jacek Antonelli | 2009-09-09 | 1 | -4/+39 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | 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 | ||||
| * | | Created my own version of Emerald's chat channel tool | McCabe Maxsted | 2009-09-09 | 1 | -4/+39 |
| |/ | |||||
* | | Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch. | Jacek Antonelli | 2009-09-04 | 1 | -3/+73 |
|/ | | | | Made a few non-functional changes to help it apply. | ||||
* | Merge branch 'sl-base-1.22' into next | Jacek Antonelli | 2009-06-08 | 1 | -5/+7 |
|\ | | | | | | | | | | | Conflicts: linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml | ||||
| * | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 1 | -1/+1 |
| | | |||||
| * | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 1 | -4/+6 |
| | | |||||
* | | Applied Armin's gesture manager patch | McCabe Maxsted | 2009-04-27 | 1 | -2/+3 |
|/ | |||||
* | Second Life viewer sources 1.21.3-RC | Jacek Antonelli | 2008-09-28 | 1 | -11/+11 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 1 | -41/+40 |
| | |||||
* | Second Life viewer sources 1.20.9 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.20.2 | Jacek Antonelli | 2008-08-15 | 1 | -29/+52 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -0/+6 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -151/+21 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -2/+5 |
| | |||||
* | Second Life viewer sources 1.18.2.0 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.18.1.2 | Jacek Antonelli | 2008-08-15 | 1 | -47/+108 |
| | |||||
* | Second Life viewer sources 1.17.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.17.0.12 | Jacek Antonelli | 2008-08-15 | 1 | -1/+3 |
| | |||||
* | Second Life viewer sources 1.15.1.3 | Jacek Antonelli | 2008-08-15 | 1 | -1/+2 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 1 | -1/+2 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -2/+0 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 1 | -0/+731 |