aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llparcel.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-031-6/+0
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * Fix #838: disable hiding of stream urlsthickbrick2011-04-011-6/+0
| | | | | | | | | | NoObscuredURL Patch from Henri Beauchamp, applied by hand because of changes between Imprudence and Snowglobe.
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Fixed bad line endings (CRLF) in many files.Jacek Antonelli2011-03-181-1/+1
| | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
| * Merge in Var Sized Regions into the Imprudence Experimental.RevolutionSmythe2011-03-181-1/+2
| |
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-1/+1
|/
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-071-1/+1
| | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* llmediaplugins first stepArmin Weatherwax2010-09-231-0/+25
|
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-4/+37
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-30/+30
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-0/+22
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-2/+2
|
* 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-12/+12
|
* Second Life viewer sources 1.18.5.0-RCJacek Antonelli2008-08-151-2/+4
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-17/+16
|
* Second Life viewer sources 1.17.3.0Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-151-1/+0
|
* Second Life viewer sources 1.17.0.12Jacek Antonelli2008-08-151-11/+33
|
* Second Life viewer sources 1.16.0.5Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-5/+5
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-151-5/+1
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-151-0/+595