aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelvolume.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Last of the unused variables goes bye.David Walter Seikel2013-04-091-2/+2
| |
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-1/+1
|/
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-2/+3
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-1/+1
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-19/+19
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-7/+20
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-3/+3
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-1/+0
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-0/+3
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-0/+1
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-151-3/+3
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+518