| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
to use the repo revision number for now.
|
|
viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merging from server-1.26 to trunk
Only a few conflicts:
scripts/farm_distribute : the upload rate in trunk was even more
conservative than the one I switched to in
1.26, so kept the trunk version.
indra/llcommon/llversionserver.h : did svn revert to keep trunk
indra/newsim/lltask.cpp : svn is weird. The merge conflict was one
that it's not obvious why it was there.
However, Simon and I looked at it, and the
solution was obvious : keep the trunk blob
where the conflict was flagged.
indra/lib/python : conflict was differing versions of the eventlib
extern. did svn revert . to keep trunk.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
NOTE : also ran
scripts/update_version_files.py --verbose --server --server_channel="Second Life Server"
to update server version information before doing a compile test.
Committed with the results of this version file update.
Conflicts resolved by prospero:
scripts/maintenance/update-groups.py : kept the trunk version (was
merged from Rad Chillies)
scripts/make_deploy_group.py : merge by hand (I'm the one to do this,
anyway)
indra/llcommon/llversionserver.h : kept trunk version
indra/newsim/llgettaskstats.cpp : kept trunk version. (svn revert)This
was imported late into 1.25, after the
branch merged into trunk, and no
changes were made in the 1.25 branch
after the import.
indra/newsim/llparcelstats.cpp : same as llgettaskstats.cpp
indra/newsim/llscriptcounter.h : same as llgettaskstats.cpp
indra/newsim/llagentinfo.cpp : like llgettaskstats.cpp, but more
complicated as some of soft's God-logging
that came from 1.24->1.25 was in here.
Fortunately, the conflict was trivial
(missing include)
idnra/newsim/simulator.cpp : one small conflict. Kept the 1.25 version
of SKU/product stuff, as it was likely part
of the homestead stuff that was recently
put into 1.25. However, there was some
code after that in the merge conflict that
had been removed from trunk that I also
removed in the resolution. This code is 27
lines starting at the comment "Asset cache
service", as can be found in the
server-1.25 branch.
indra/newsim/tests/fakeobjects.h : kept the trunk version. No changes
to 1.25 after parcel stats merge,
except for a compile error fixed by
andrew about which he warned there
would be merge issues...
indra/newsim/tests/llgettaskstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/tests/lllslmanager_tests.cpp : same as llgettaskstats.cpp
indra/newsim/tests/llparcelstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/llgettaskstats.h : same as llgettaskstats.cpp
indra/newsim/llparcelstats.h : same as llgettaskstats.cpp
indra/newsim/llscriptdata.cpp : same as llgettaskstats.cpp, except for a
fix that josh made both to trunk and
1.25
indra/newsim/llscriptdata.h : same as llscriptdata.cpp
indra/newsim/llscriptcounter.cpp : same as llgettaskstats.cpp
indra/newsim/CMakeLists.txt : similar to llgettaskstats.cpp, except that
there was an additional change to trunk
(so doing "svn revert" to keep trunk is
still the right thing)
indra/backbone/multiagentchat.py : where there were conflicts, kept the
server-1.25 version. Phoenix had put
in some fixes for dealing with
omissions of the accept header in the
1.25 branch.
indra/backbone/group_linden_dollar.py : similar to multiagentchat.py.
All but one or two conflicts
were utterly trivial (missing
blank line)
indra/backbone/agent_linden_dollar.py : all merge conflicts were utterly
trivial (missing blank line);
I'm surprised svn got all fussy
about them.
indra/lib/python : conflict was because the externals had been futzed
with in 1.25 during debugging of backbone memory
bloat. Kept the externals as in trunk.
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
|
|
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server
|
|
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
* Respect pre-1.19.0 voice settings
* Re-fix DEV-11213 "SECURITY: Web site can use IFRAME to launch SL and steal your password"
|
|
|
|
Changes from 1.19.0.2 and 1.19.0.3
DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031 Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066 Checking to select a role does not enable the apply button
DEV-8809 stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans. svn merge -r77376:77377 sl-parcelmedia-3. OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 Alt and left/right arrow keys dont move you between tabs
DEV-10093 Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 Redocking the Contact list causes the communicate ui to get ugly
DEV-8131 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)
|
|
QA'd in QAR-186:
DEV-9179: Commit translated and reviewed strings from 1.19 frozen branch pull
DEV-8792 Place information teleport button hidden behind chat bar.
DEV-9374: Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0
DEV-9411 -- Update required version of Quicktime library to 7.4 for 1.19.0 Viewer
DEV-9430 Viewer auth failed login screen is shown in the loginxui 1.19 viewer on failure to retrieve normal login screen - changed wording of error page
DEV-8537 Chat console appearing underneath status buttons
DEV-9283 Chatbar cant be open while in mouselook
DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9520 Menus and Other items minimise behind onscreen buttons
DEV-9521 Unable to ctrl and click to select in the friends list
DEV-9530 SEC-20 Exploit to force users to teleport to a location on profile open.
DEV-6833 - Mature events icon and checkbox is missing from map legend
Also:
Added vc9 project files (+ minor changes for vc9) (steve)
Modified vc project files to not include the path for flex / bison (steve)
Added marker file deletion to crash logger to stop double reporting. (cube)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
Port these changes which have passed QA in QAR-186:
* Bumping version numbers to 1.19.0
* DEV-8872 Text in group list in profile and group notices is difficult to read
* DEV-9290 Clicking on Chat button in toolbar does not toggle chat bar
* DEV-4721 Upload symbol map files to S3
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes made to 1.18.6 Viewer, including:
* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp
Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
|
|
maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
Last of the fixes from 1.18.5 Viewer RC series
|
|
svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer
Pick up last minute patches to the viewer from 1.18.3 final release.
* Final release notes and version numbers
* SL-55123 Mac app icon missing from open source tarball (missed from previous merge?)
* SL-55121 Mac mouse cursors missing from open source tarball (missed from previous merge?)
(I believe the previous merge in this series, r70180, only committed changes inside indra. I've scrubbed the history of that range and don't see any other missing files other than the two assemblies/ patches noted above)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
|
|
into release. had to blow away the libraries directory to clear up svn evil.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Sync up fixes, version numbers, and release notes applied to the viewer RC branch.
|
|
* Tweak simulator_version script to slam all regions to the new version we're deploying
|
|
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
|
|
Includes voice-server-changes (0:66493)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release
Sync up last minute patches that went into 1.18.
|
|
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
|
|
|
|
|
|
|
|
|
|
|
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
|
|
|
|
|
|
into release
|
