summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-06-30Fixes to let llcommon build as a .dylib. It depends on PTH library.brad kittenbrink
2009-06-29Fix for mismatched cmake if/endif pairs in llwindow/CMakeLists.txtbrad kittenbrink
2009-06-29Merged my latest eventhost changes with tip/latest viewer-2.0.0-3.brad kittenbrink
2009-06-29Merge with viewer-2.0.0-3Bryan O'Sullivan
2009-06-27fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop ↵Xiaohong Bao
when setting parent
2009-06-26Fix broken Linux server build.Kyle Ambroff
llwindow refactoring in skinning-7 r117641 added dependency on LLWindowCallbacks in llwindowheadless, which was not being built for server only builds. * Include llwindowcallbacks.cpp in all llwindow builds. * Do not link with libatk and libsdl for server linux builds, since they are not needed and only packaged for the viewer. Reviewed with James.
2009-06-26Moved LLAPRSockStream out of llcommon into eventhost module so I can ↵brad
reenable its tests in the new world order.
2009-06-26DEV-34569Palmer Truelson
new --nonotifications command line option for automated testing Reviewed by Q
2009-06-25DEV-34488 Can not save script to a prim. Underlying issue was LLPreview ↵James Cook
holding two member variables mObjectUUID and mObjectID. mObjectID was null for scripts. It appears to be used only for notecards (?), so I converted it to mNotecardObjectID and switched references to point to mObjectUUID. Renamed one other variable to mSaveObjectID for clarity. Removed unnecessary include files and de-inlined a couple functions because I was there. Reviewed with Steve.
2009-06-25Merge with SVN login-api-3 branchBryan O'Sullivan
2009-06-25Fix remaining Mac build errorsNat Goodspeed
2009-06-24Mercurial build: minor tweaks to fix some Mac build errorsNat Goodspeed
2009-06-24two more llstartup.cpp merge issues.Mark Palange (Mani)
2009-06-24Commiting merged llstartup.cpp, again?Mark Palange (Mani)
2009-06-24merge -r125267:125272 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24DEV-31980: remove cruft from lleventdispatcher.hNat Goodspeed
2009-06-24Fix Mac BuildChristian Goetze
2009-06-24DEV-31980: Extend LLEventDispatcher to handle const as well as non-constNat Goodspeed
methods. Introduce LLAppViewerListener based on LLDispatchListener, instantiate a static one in llappviewer.cpp. Initial implementation only supports ["op"] == "requestQuit".
2009-06-23A few more merge error fixes.Mark Palange (Mani)
2009-06-23Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txtMark Palange (Mani)
Copied snprintf declaration in llstring from login-api-3
2009-06-24QAR-1619 Fixing linux build error re: llui_libtest linkageMark Palange
2009-06-23Set correct svn:eol-style native on XML files, converted several files to ↵James Cook
use consistent line feeds (had ^M after first header line). Not reviewed.
2009-06-23Merge build patch for Linux server builds from xui-army. I believe this ↵James Cook
fixes the "llui_libtest -lllui not found" build error. Merging revisions 123378-123379 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army into G:\viewer-2-0-link\latest, respecting ancestry
2009-06-23Resolve mergeNat Goodspeed
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-23Fixed a bunch of missing includes and forward declares. I was trying to ↵James Cook
benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed.
2009-06-23QAR-1619: For some reason the LLWindowMesaHeadless constructor omitted theNat Goodspeed
LLWindowCallbacks* parameter passed by its consumer and required by the base-class LLWindow constructor.
2009-06-23QAR-1619: fix Linux-only missing #include (Linux-only reference to LLTrans)Nat Goodspeed
2009-06-23Fixed an "ADD_BUILD_TEST" leftover from the initial merge.palange@becane.lindenlab.com
2009-06-22Switch to new unit test infrastructureBryan O'Sullivan
2009-06-22Merge with trunkBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-22Python 2.4 and 2.6 improvementsBryan O'Sullivan
The sets module is no longer needed with Python 2.4, and causes a DeprecationWarning with 2.6, so drop it The md5 module causes a DeprecationWarning with 2.6, so try to import hashlib (its replacement) instead, else fall back Reviewed by Poppy.
2009-06-22Merge with trunkBryan O'Sullivan
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22trivial comment fixes for typos that were bugging me...Adam Moss
2009-06-21Modified RecordToChatConsole to not construct LLFloaterChat if it doesn't ↵Steven Bennetts
already exist to avoid recursive floater construction.
2009-06-21Fixed a shutdown crash.Steven Bennetts
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-06-20svn merge -r124872:124873Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
2009-06-19result of "svn merge -r123757:124890 ↵Paul Oppenheim
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-19DEV-31980: extract dispatch-by-string-name logic from LLAresListener to newNat Goodspeed
LLEventDispatcher and LLDispatchListener classes. See LLAresListener for example usage.
2009-06-18First pieces of event host module (DEV-31978).Brad Kittenbrink
Basically implements the spec nat decribed in the jira. Test coverage isn't yet complete though. mostly paired with nat.
2009-06-17DEV-32777: tip won't even build on Windows without pacifying MSVC warningNat Goodspeed
2009-06-11Merge with SVN trunkBryan O'Sullivan
2009-06-10Added LLAPRSockStream class and associated LLAPRSockStreambuf class forBrad Kittenbrink
DEV-31978 viewer event host socket module. reviewed by palmer+nat+mani.
2009-06-04Fix one more license, add indra/newview/tests to exported treeChristian Goetze