- Sep 21, 2010
-
-
Brad Payne (Vir Linden) authored
-
- Aug 24, 2010
-
-
Tofu Linden authored
back-out the back-out for this branch. yay.
-
Tofu Linden authored
Backing out this merge that I pushed (prematurely) to the wrong place.
-
- Aug 16, 2010
-
-
Richard Nelson authored
-
- Aug 13, 2010
-
-
Oz Linden authored
-
- Jul 30, 2010
-
-
Richard Nelson authored
-
Richard Nelson authored
-
- Apr 05, 2010
-
-
Loren Shih authored
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
-
- Feb 02, 2010
-
-
Mark Palange (Mani) authored
-
- Jan 28, 2010
-
-
Tofu Linden authored
Checker: UNINIT_CTOR Function: LLFloaterScriptQueue::LLFloaterScriptQueue(const LLSD &) File: /indra/newview/llcompilequeue.cpp
-
- Jan 26, 2010
-
-
Alexei Arabadji authored
--HG-- branch : product-engine
-
- Jan 20, 2010
-
-
Ychebotarev ProductEngine authored
there was some places with messages that (as I think) should not go to nearby chat. but still probably should go somewhere... code is commented and messages are marked with: //TODO* CHAT: how to show this? --HG-- branch : product-engine
-
- Jan 18, 2010
-
-
Ychebotarev ProductEngine authored
leave some LLFloaterChat usages commented for later review... --HG-- branch : product-engine
-
- Nov 25, 2009
-
-
James Cook authored
Cuts number of includes of llnotifications.h from 300+ to 40.
-
James Cook authored
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
-
- Jun 23, 2009
-
-
James Cook authored
Fixed a bunch of missing includes and forward declares. I was trying to 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.
-
- Jun 21, 2009
-
-
Steven Bennetts authored
ignore-dead-branch
-
- May 08, 2009
-
-
Steven Bennetts authored
-
- Jan 07, 2009
-
-
Aaron Brashears authored
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
-
- Jan 05, 2009
-
-
Kent Quirk authored
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
-
- Dec 23, 2008
-
-
Mark Palange authored
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
-
- Aug 14, 2008
-
-
Josh Bell authored
svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release From 1.23: * DEV-18788 SEC-136: Avatars Link as links instead of sits * DEV-18754 Instant simulator crash using llUnescapeURL * QAR-780 Test the viewer crash reporter in branch crashlogger_vc8@92961 * login.cgi foo by billc * DEV-18732 QA the flow for first landing location change: Help Island + Browser Tutorial * Added email notification of crashloganalyzer.py failures * QAR-802 / DEV-19069 - merge maint-webds-1-23 to Branch_1-23-Server * removed obsolete start-location code Backport fixes from UPCOMING production branch: * DEV-19031 Crash in new Mono code when one object rezzes another with active script * DEV-19050 SVC-2745: llSetLinkPrimitiveParams misbehaving on 1.23 server if avatar is near ground * DEV-16129 Break getStartLocation timeout apart from rest of teleport request failure metric * DEV-14270 Add a column to tp metric to differentiate teleports, local teleports, and region_crossings * DEV-18965 Unable to save scripts when running a sim on windows. * DEV-17376 some region links in Search teleport you without warning * DEV-17796 Sim performance decreases a lot with rezzing physical objects * DEV-19142 SVC-2773: Mono Beta: Script editor "Save" does not save scripts containing syntax errors * Switched serialized data to a vector instead of a GCed Mono array * Made update of cache explicit * Added heartbeats during long derezzes and deletes to stop the launcher killing the sim * DEV-15010 include agent_id in search metrics * DEV-15011 Search metrics not including non 'CLASSIFIED' and 'PLACE' search types * DEV-19288 Broken webservices in 1.24 * DEV-18957 : SCUT : Enable test.py to run tests again a grid database * Remove leading whitespace to work around bug DEV - 19276 (this is NOT a fix for that bug) dataserver-is-deprecated-yo
-
- Jul 31, 2008
-
-
Dave Hiller authored
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
-
- Jun 25, 2008
-
-
Steven Bennetts authored
dataserver-is-deprecated
-
- May 08, 2008
-
-
Steven Bennetts authored
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
-
- Apr 01, 2008
-
-
Steven Bennetts authored
QAR-424
-
- Mar 10, 2008
-
-
Steven Bennetts authored
DEV-11202: Unhandled Excpetion in pipeline.cpp. Merged over updated windlight ui help text from windlight14. Reverting a const change in a virtual that was not propagated to all overrides. DEV-10957 stop and pause Media and music buttons do not work DEV-10762 Displayed page in the client browser disappears when crossing property boundaries. DEV-11220 replace misspellings in alerts.xml parameters of 'messsage' DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip DEV-11193 clean up some viewer strings related to Windlight help text svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads DEV-11110 Media browser history dropdown does not save items across sessions Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing. DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown dev-10623 "parcels that played movies no longer work in combo-merge-ui" DEV-11379 - crash in LLTabContainer::draw() DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview DEV-11158 sculpties on the top10 crash list DEV-11404 "Send Current URL to Parcel" does not set the MIME type merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database. DEV-10489: no draw distance cheating DEV-879: water noise frequency DEV-10764: macbook air support DEV-10878: Linux Intel945 support DEV-7551: featuretable adjustments for framerate. DEV-11426 Enormous mini-map. DEV-11505 - Crash in gunzip_file. Removed final LinkedList, SkipMap, and AssocList templates from the Viewer! DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
-
- Jan 17, 2008
-
-
Josh Bell authored
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573 svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods plus addition to MANIFEST for revoke-gods Actual merge: svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a * QAR-177 Linux Voice Support Merge BuildMe * QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions) * QAR-194 simcrash-economy-fix * QAR-201 Revoke gods added to deploy
-
- Oct 09, 2007
-
- Oct 04, 2007
-
-
Aaron Brashears authored
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
-
- Aug 21, 2007
-
-
Christian Goetze authored
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
-
- Mar 20, 2007
-
-
Karen Clark authored
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
-
- Feb 02, 2007
-
- Jan 02, 2007
-
-
James Cook authored
-