| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  | the server to remove the message handling. | 
|  | the flags to managed pathfinding flags such as permanent and character. | 
|  | Privacy" changes.  Many naming changes for the featureto be "See avatars"
instead of "hidden avatars".  Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE. | 
|  |  | 
|  | to the About Land / Sound tab.  Reviewed by Kelly. | 
|  | change to "hidden avatars" | 
|  | viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not | 
|  | Kelly | 
|  |  | 
|  |  | 
|  | 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 | 
|  | svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL | 
|  | release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation. | 
|  | svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4 | 
|  | QAR-424 | 
|  | originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. | 
|  | svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | 
|  | svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release | 
|  | svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341  -> release | 
|  | into release | 
|  | concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen | 
|  |  |