aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2012-02-201-8/+31
|\ | | | | | | | | | | | | | | Conflicts: linden/indra/newview/installers/windows/meta-impy_installer_template.iss Branding conflict, fixed. linden/indra/newview/llviewerwindow.cpp Already had this change, but merged the minor difference.
| * Fixed tons of 'LLXMLTree invalid token' warnings spamming the log and made ↵McCabe Maxsted2012-02-171-8/+31
| | | | | | | | the warnings we show less confusing
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-032-0/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * Added ll_frand(min, max) functionMcCabe Maxsted2011-09-082-0/+20
| |
* | Merge remote-tracking branch 'imprudence/1.4-beta1.5' into nextDavid Walter Seikel2011-07-211-4/+12
|\ \ | |/ | | | | | | | | | | Conflicts (merged manually): .gitignore linden/indra/newview/llgesturemgr.cpp linden/indra/newview/viewerinfo.cpp
| * return 0 when mFile isn't found in llapr rather than asserting alwaysMcCabe Maxsted2011-07-051-4/+12
| |
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-044-41/+60
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-251-14/+8
| |\
| | * Ported viewerinfo.cpp from Kokua.Jacek Antonelli2011-05-191-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It defines the ViewerInfo module/namespace, which contains a variety of functions for querying the viewer name and version. It is designed to be a replacement for viewerversion.cpp and viewerversion.xml. viewerversion.cpp has been removed, but viewerversion.xml remains (albeit with a bogus version number) until the packaging system no longer uses it.
| * | Merge remote-tracking branch 'armin/misc' into nextJacek Antonelli2011-05-222-26/+43
| |\ \ | | |/ | |/|
| | * show llwarns instead of llinfos when llsd parsing fails and add the reason + ↵Armin Weatherwax2011-05-172-26/+43
| | | | | | | | | | | | line
| * | Merge branch '1.3-maint' into nextJacek Antonelli2011-05-181-1/+9
| |\ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: linden/indra/llcommon/CMakeLists.txt linden/indra/newview/llvoavatar.cpp linden/indra/newview/viewer_manifest.py
| | * also link with ld.goldArmin Weatherwax2011-05-171-1/+9
| | | | | | | | | | | | thanks to Aleric and Siana for the idea
| | * Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-221-1/+1
| | |
| | * SNOW-422: Imprudence doesn't compile with g++ 4.4.x (#562)Aleric Inglewood2010-10-031-1/+1
| | |
| | * Fixed some missing constants in the script editor and added ↵McCabe Maxsted2010-08-262-0/+18
| | | | | | | | | | | | llGetLinkNumberOfSides
| | * Applied patch for #424: fix proper detection of Windows 7, backport from ↵McCabe Maxsted2010-08-261-3/+39
| | | | | | | | | | | | Snowglobe 2.0 by Ansariel Hiller
* | | Merge branch 'libotr' into expDavid Seikel2011-05-124-30/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | | Missed checkinJay Threeth2011-05-081-0/+2
| | | |
| * | | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-084-30/+30
| | | | | | | | | | | | | | | | ll_snprintf, namespace hacks confused vc2005
* | | | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-265-29/+170
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | Conflicts (for future reference): linden/indra/llcommon/llstring.cpp linden/indra/newview/llpanelnetwork.cpp linden/indra/newview/llselectmgr.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/lltoolmgr.cpp linden/indra/newview/llvoavatar.cpp
| * | fix some flaws in the cloud particle prefsArmin Weatherwax2011-04-192-0/+3
| | |
| * | Remember name and password based on grid. This is far from optimal, but will ↵McCabe Maxsted2011-04-192-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work for the time being. * UI needs to be made clear on what's going on with user's passwords * 'Remember password' checkbox now works on login (but is unclear) * Stored passwords are MD5s in grid_info.xml * Fixed vivox license appearing on other grids rather than specifically on second life login when voice is enabled * Small fix for username entry after logout * Sadly, storing password in the mac keychain needs to be reimplemented now
| * | Identify Windows Server 2008 and 2008 R2, added Win 8 detection for ↵McCabe Maxsted2011-04-131-17/+41
| | | | | | | | | | | | future-proofing. Ported from Phoenix, patch by Tank Master
| * | fix bug #853 crash caused by antistringsArmin Weatherwax2011-04-111-1/+2
| | |
| * | Fixed Mhz -> MHz, ported from Singularity, patch by ShyotlMcCabe Maxsted2011-04-062-9/+9
| | |
| * | Extended windows detection to include Windows 7, ported from Singularity, ↵McCabe Maxsted2011-04-062-9/+122
| | | | | | | | | | | | patch by Shyotl
* | | Push some of the trivial changes from the accountList branch.David Seikel2011-04-032-0/+14
| | | | | | | | | | | | Should not change anything, and there will be more to come.
* | | We don't need support for the aurora grid in the viewer for the meta 7 grid.David Seikel2011-03-201-5/+0
| | | | | | | | | | | | It seems like a waste of code anyway.
* | | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-203-4/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge remote-tracking branch 'jacek/exp' into expMcCabe Maxsted2011-03-192-3/+8
| |\ \
| | * | Fixed bad line endings (CRLF) in many files.Jacek Antonelli2011-03-181-5/+5
| | | | | | | | | | | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future.
| | * | Fix setting the viewer offset time from OpenRegionSettings, and also have it ↵RevolutionSmythe2011-03-181-3/+3
| | | | | | | | | | | | | | | | show what UTC offset it is representing in the time bar.
| | * | Merge in Var Sized Regions into the Imprudence Experimental.RevolutionSmythe2011-03-181-1/+6
| | | |
| * | | Use a buffer for debug console output (improves speed on Windows when ↵McCabe Maxsted2011-03-141-0/+3
| |/ / | | | | | | | | | console is enabled). Ported from Singularity, patch by Shyotl
| * | use logcontrol.xml also for SLPluginArmin Weatherwax2011-03-011-1/+1
| | |
* | | Ingrease maximum group roles to 25.David Seikel2011-03-031-1/+1
| | |
* | | Merge branch 'branding' into weekly, with some post merge branding tweeks.David Seikel2011-03-019-29/+22
|\ \ \
| * | | Unbranding. Todays word is "linden".David Seikel2011-02-258-25/+18
| | | |
| * | | Merge branch 'weekly' into brandingDavid Seikel2011-02-2022-417/+1518
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * | | | Changing some "Second Life" references to "meta-impy".David Seikel2011-02-131-1/+1
| | | | |
| * | | | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to be reverted later. Changed file names to.
* | | | | Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-03-011-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Changed imprudenceviewer.org URLs to the new kokuaviewer.org URLs.Jacek Antonelli2011-02-271-1/+1
| | | |
* | | | Merge remote-tracking branch 'mccabe/weekly' into weeklyDavid Seikel2011-02-2022-417/+1518
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge remote branch 'remotes/github/weekly' into weeklyMcCabe Maxsted2011-02-1820-417/+1261
| |\ \
| | * | Fixed Windows compile error introduced in fe9a3d2b. Also made sure ↵McCabe Maxsted2010-11-236-1/+13
| | | | | | | | | | | | | | | | winsock2.h is always included before windows.h throughout the source to prevent collisions
| | * | Merge remote branch 'aleric/weekly' into weeklyMcCabe Maxsted2010-11-2316-417/+1249
| | |\ \
| | | * | IMP-701: An API to wrap objects for thread-safe access.Aleric Inglewood2010-11-174-4/+564
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/701
| | | * | IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-1715-416/+688
| | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/590
generated by cgit v1.1 at 2025-02-19 16:45:26 +0000