aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llchatbar.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gridmanager' into nextJacek Antonelli2009-09-261-8/+10
|\
| * Cleaned up channel control code in llchatbar.cpp someMcCabe Maxsted2009-09-251-8/+10
| |
| * Temporarily disable chat channel control in chat history until it's fixedMcCabe Maxsted2009-09-251-1/+1
| |
* | Merge branch 'next' into login-managerJacek Antonelli2009-09-231-1/+1
|\ \ | |/ | | | | | | | | Conflicts: linden/indra/newview/llinventorymodel.cpp linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
| * Merged in jacek/nextMcCabe Maxsted2009-09-141-3/+73
| |
| * Removed old commentMcCabe Maxsted2009-09-091-1/+1
| |
* | Merged 'armin/grid-manager5' into login-managerJacek Antonelli2009-09-101-0/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/CMakeLists.txt linden/indra/newview/llpanellogin.cpp
| * | looks like working nowArmin Weatherwax2009-07-111-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 nextJacek Antonelli2009-09-091-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 toolMcCabe Maxsted2009-09-091-4/+39
| |/
* | Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.Jacek Antonelli2009-09-041-3/+73
|/ | | | Made a few non-functional changes to help it apply.
* Merge branch 'sl-base-1.22' into nextJacek Antonelli2009-06-081-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-RCJacek Antonelli2009-01-111-1/+1
| |
| * Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-4/+6
| |
* | Applied Armin's gesture manager patchMcCabe Maxsted2009-04-271-2/+3
|/
* Second Life viewer sources 1.21.3-RCJacek Antonelli2008-09-281-11/+11
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-41/+40
|
* Second Life viewer sources 1.20.9Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-29/+52
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-0/+6
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-151/+21
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-2/+5
|
* Second Life viewer sources 1.18.2.0Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-47/+108
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.17.0.12Jacek Antonelli2008-08-151-1/+3
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-1/+2
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-1/+2
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-2/+0
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+731