Commit Graph

254 Commits (94ac0064354594de8adbb99084029c8b4027b2f6)

Author SHA1 Message Date
Dave Parks 1ff7968312 SH-1225 Add skinning info to import path of .slm files. 2011-03-28 23:50:23 -05:00
Dave Parks 6ff87e2840 SH-1169 Import from slm instead of dae when appropriate. 2011-03-22 17:23:48 -05:00
Dave Parks a242129b57 SH-523 Fix for non-finite values in silhouette rendering resulting in silhouette segments pointing at center of screen. 2011-02-08 15:53:50 -06:00
Xiaohong Bao d08372f71d merge fix for SH-659 from v-d to mesh: small textures not loaded 2011-02-01 12:43:12 -07:00
Loren Shih c7d0fab7b9 Fixes for merge up from viewer-development to mesh-development.
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01 12:33:39 -05:00
Loren Shih fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
Dave Parks f3493d4165 SH-822 Fix for crash in cacheOptimize (U16 should have been a U32) 2011-01-19 23:14:41 -06:00
Xiaohong Bao c602fed9b7 fix for SH-659: small textures not loaded 2011-01-18 14:08:21 -07:00
Dave Parks ce5dc4d42b SH-762 Forsyth style vertex buffer optimization for meshes. 2011-01-07 13:47:50 -06:00
Dave Parks e9d21ba941 Fix for windows build. Reviewed by Nyx. 2010-12-20 15:09:15 -06:00
Boroondas Gupte 8edd7e94b1 merged CTS-323: Don't cast pointers to U32 2010-11-23 01:52:11 +01:00
Dave Parks c149a0020b Get rid of pointless redirection and malloc/free. 2010-11-21 03:06:47 -06:00
JonathanLinden ffb8b78ae9 Reverting fix for SH-391 until it works for all use cases 2010-11-03 17:11:08 -07:00
JonathanLinden 117af7e7e3 Fix for SH-391 'Viewer crash when enabling align planar faces on a mesh object'. Paired with Runitai 2010-11-03 13:23:53 -07:00
Dave Parks ed29cac3a1 SH-92 Fix for busted bounding boxes for mirrored meshes. 2010-10-29 16:10:17 -05:00
Dave Parks 78e62d0030 Fix for bad normals on some prim faces. 2010-10-29 12:06:20 -05:00
Dave Parks da04af47cc Fix for bad binormals. 2010-10-26 16:19:24 -05:00
Boroondas Gupte 4f388eacf6 merged CTS-323: Don't cast pointers to U32 2010-10-24 16:13:31 +02:00
Boroondas Gupte 32b0747e33 CTS-323: (part 2 of 2) Don't cast pointers to U32 2010-10-24 16:07:43 +02:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 478e0927c8 Interface/state for rendering convex hull physics shapes. Still need to implement gMeshRepo.buildHull 2010-10-04 09:48:05 -05:00
Dave Parks 11fce20134 Add llhysicsshapebuilderutil 2010-10-01 13:33:14 -05:00
Matthew Breindel (Falcon) 569f3f4b06 Merge 2010-09-22 13:04:53 -07:00
Jonathan Wolk 6d8e9cd8bd Commenting out unused variables to help mac build 2010-09-22 11:22:50 -07:00
Dave Parks cf09d6c58a Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater. 2010-09-22 03:04:21 -05:00
Dave Parks 7d625ef060 merge 2010-09-22 01:44:44 -05:00
Dave Parks d40db3d8e1 SH-100, SH-111 Fix for generate normals stalling/crashing.
Switch from "new" to "malloc" in llvolume.cpp aligned arrays so "realloc" can be used to avoid copies.
2010-09-22 01:43:17 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Dave Parks c42ed54b0a Stop using ll_aligned_malloc/free in llvolume.
Fix for garbage data in vertex weight array crashing software skinning.
Proper integration of picking for rigged attachhments.
Optimization in LLDrawable::updateDistance (don't call updateRelativeXform, just use spatial group position).
2010-09-20 18:45:56 -05:00
Dave Parks 90da6d6fdc Raycasting for rigged attachments now works for your own attachments while in edit mode. 2010-09-19 23:07:15 -05:00
Dave Parks 3cda760638 Added test code for volume raycast octree and fixed a crash in render cost calculation when selecting trees/grass. Reviewed by jwolk. 2010-09-10 14:08:12 -05:00
Dave Parks 1c286f6b0b Merge cleanup. 2010-08-31 18:10:02 -05:00
Dave Parks e68f9e566b merge 2010-08-31 16:37:40 -05:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Dave Parks 2fea1d5d33 Integrate SIMD API from oreh/server-trunk-oreh 2010-08-19 12:25:15 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 129e31373e Better < operator for LLVolumeFace::VertexData 2010-08-06 11:57:03 -05:00
Dave Parks 93ea3d2850 Merge cleanup. 2010-07-15 14:17:51 -05:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Dave Parks 2dd3a6be72 Fix for mesh upload, consolidate generating bad indices, and normal generation. 2010-07-13 12:02:14 -05:00
Dave Parks 46768c3c6c Merge? 2010-07-12 07:39:23 -05:00
Dave Parks 66e353812f Get meshes working post-SSE pass. 2010-06-15 19:16:39 -05:00
Dave Parks 1b7b8aa00e merge 2010-06-14 23:14:14 -05:00
Dave Parks 6e37ec08f6 Builds with LLConvexDecompInter as a static lib. 2010-06-14 23:13:10 -05:00
Dave Parks 2ff888d2bc Unused variable. 2010-06-10 21:47:49 -05:00
Dave Parks 1061c640d3 merge 2010-06-10 15:04:34 -05:00
Dave Parks d2d49e3d84 Fix for memcpyNonAliased16 issues. 2010-06-10 15:02:41 -05:00
Dave Parks 9440f84dca Potential fix for busted binormals on cubes. 2010-06-10 14:58:02 -05:00
Dave Parks f9b13d8f85 Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes. 2010-06-10 00:45:48 -05:00
Dave Parks 9faf00b40f merge 2010-06-04 12:08:16 -05:00
Dave Parks a8f0e47fd5 Normal debug display and fix for bad bump mapping and planar texture coordinates. 2010-06-04 12:07:55 -05:00
Tofu Linden 6ca40c7afb more needed #includes 2010-06-04 09:10:00 +01:00
Tofu Linden dc2f50642b lots of _mm_malloc and _mm_free -> ll_aligned_malloc_16 and ll_aligned_free_16
more to come.
2010-06-04 08:54:03 +01:00
Tofu Linden 087b749908 fix scoping issues for gcc 2010-06-04 08:46:00 +01:00
Dave Parks 26ba00b555 Vectorized octree and much of llspatialpartition and lldrawable.
Octree driven raycast.
2010-06-03 12:52:28 -05:00
Dave Parks 9a869d6301 Octree triven raycast works, time to profile. 2010-05-29 19:55:13 -05:00
Dave Parks 0e7f4dc5ce Octree per LLVolumeFace WIP 2010-05-29 05:37:38 -05:00
Dave Parks c98b1b3fd9 Fully aligned llvolume 2010-05-26 03:29:19 -05:00
Dave Parks e6fe3b1f1a Better vectorization of various things. Turn off debug gl by default. 2010-05-25 03:55:01 -05:00
Dave Parks c0b654dd4b Fix for bad feeding of vectorized raycast. 2010-05-24 17:33:41 -05:00
Matthew Breindel (Falcon) 52134bdc81 Merge 2010-05-24 13:38:16 -07:00
Matthew Breindel (Falcon) a2eb86b009 Ack. Fixed a bunch of stupid type mistakes in llvector4a. 2010-05-24 13:37:59 -07:00
Dave Parks 8c32e3bf29 Fix for bad indexes on cube faces.
Extra validation on vertex buffers.
2010-05-24 14:03:10 -05:00
Dave Parks d7cab99ba7 Fix for a couple dumb mistakes. 2010-05-22 12:37:53 -05:00
Dave Parks 4d57cb3c09 Vectorize/memory align buffers in llvolumeface WIP 2010-05-22 04:35:02 -05:00
Dave Parks 8919f4811a blah 2010-05-21 23:55:18 -05:00
Dave Parks b740924c9d Make LLVolume::createSide a little faster.
(transplanted from 4d43e3b83ccffd725ec6cb234ddcfa0833f17a9f)
2010-04-28 02:53:12 -05:00
Dave Parks 4a501bb437 Make LLVolume::createSide a little faster.
(transplanted from 4d43e3b83ccffd725ec6cb234ddcfa0833f17a9f)
2010-04-28 02:53:12 -05:00
Dave Parks d71716aa6d Make LLVolume::createSide a little faster. 2010-04-28 02:53:12 -05:00
Dave Parks 07c0389f50 Proper byte ordering when decoding skin weights. 2010-04-27 01:50:06 -05:00
Dave Parks 47ffcdb93d Rigged attachments (almost works). 2010-04-06 16:24:08 -05:00
Dave Parks 807d835c2b First draft of skin weights in .mesh asset 2010-04-02 14:43:05 -05:00
Dave Parks 71d11af310 Mesh cache. Has a bug. 2010-03-13 17:39:32 -06:00
Dave Parks 4c0e2f7921 "Generate Normals" is less busted now. 2010-03-11 12:02:37 -06:00
Dave Parks d60f5e937f Tool tips for model preview. Rename "Impostor" to "Lowest" 2010-03-09 14:28:06 -06:00
Dave Parks 3c78771ace Removed scale from model importer.
Removed support for scale entry in mesh assets.
Fixed MeshMaxConcurrentRequests being ignored.
Added mesh download queue debug text.
2010-02-24 22:02:01 -06:00
Dave Parks 066f9de07e Fix for normals getting squished on consolidation.
Replaced some magic numbers with constants.
Switched up throttling of mesh upload HTTP posts to prevent overloading one capability at a time.
Added some feedback on upload progress via debug text.
Made debug text move with side panel (keep debug text from rendering on top of side panel).
2010-02-23 16:57:06 -06:00
Dave Parks ee80367128 16-bit limit awareness when consolidating models. 2010-02-17 18:08:00 -06:00
Dave Parks 3bca0fceb2 merge 2010-02-17 11:33:47 -06:00
Dave Parks ffcbbf4aaa Multi-threaded asset uploading with proper ordering first draft. 2010-02-11 18:00:00 -06:00
Tofu Linden 44cfa948c7 merge. 2010-02-11 11:19:51 +00:00
Tofu Linden 792ebb1936 CID-423
Checker: UNINIT
Function: LLVolume::cleanupTriangleData(int, const std::vector<LLVolume::Point, std::allocator<LLVolume::Point>> &, int, int *, int &, LLVector3 **, int &, int **)
File: /indra/llmath/llvolume.cpp

The code looks right, I'm just adding an llassert().
2010-02-10 16:49:56 +00:00
Dave Parks bf087b74d3 merge 2010-02-09 12:28:31 -06:00
Dave Parks 2cb5b0b66e consolidate button work in progress 2010-02-09 12:26:09 -06:00
davep@billy.gateway.2wire.net 6d4b4762d1 merge 2010-02-09 11:23:33 -06:00
Palmer Truelson bd10ded1da index off for tristrip fix on davep's tristrip optimization 2010-02-23 18:03:37 -08:00
Dave Parks 42df75bafe Enable FBO multisampling for OSX.
Fix bad triangle in prim caps.
2010-02-08 10:14:11 -06:00
Dave Parks adf601ef1f Draw prims using triangle strips instead of triangle lists. 2010-02-06 17:33:12 -06:00
Dave Parks 095a5e8440 Draw prims using triangle strips instead of triangle lists. 2010-02-06 17:33:12 -06:00
Karl Stiefvater (qarl) 024c0ebe19 enable mirror and invert flags for meshes. 2010-01-29 14:33:04 -06:00
Karl Stiefvater (qarl) 512a5736dc LODs for scene upload 2009-12-23 14:40:48 -06:00
Palmer 0afe1fd41d Applied (manually in places) diff from svn.lindenlab.com/svn/linden/branches/render-pipeline/render-pipeline-7@135361 to get deferred rendering changes from the svn branch. Bleh! 2010-03-26 13:19:01 -07:00
Dave Parks 081fa98a47 HTTP Mesh transfer relatively blocking-free. 2009-12-15 17:43:05 -06:00
Dave Parks 695969c770 HTTP Mesh fetch FTW.. still busted 2009-12-11 14:47:11 -06:00
Karl Stiefvater (qarl) bb2631180a CTS-4 Only part of an uploaded mesh renders. 2009-12-01 17:40:52 -06:00
Dave Parks f039fa98ef Fix for silly crash due to LLPrimitive having 0 texture entries. 2009-11-30 17:02:38 -06:00
Dave Parks 062a2dd309 Remove zero area triangles from meshes post-import. 2009-11-30 15:32:10 -06:00
Dave Parks 6d66910c6e Fix for spam on invalid mesh asset.
Fix for index buffer overflow spam and crash in llvertexbuffer.
2009-11-25 11:35:41 -06:00
Dave Parks 62233f2246 Fix for copying of tetrahedrons in place of mesh LODs.
Fix for bad tetrahedron bounding box.
Bad fix for simultaneous loading of multiple LODs.
2009-11-24 07:38:04 -06:00
Dave Parks 81bfdcbfae Tetrahedron displays in place of unloaded mesh. Still has some LOD issues. 2009-11-18 18:10:48 -06:00
Dave Parks c02702f387 CTS-7 Add hard edge threshold capability to normal generation. 2009-11-13 17:01:56 -06:00
Palmer 6f3536d597 Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info 2009-11-11 15:16:49 -08:00
Dave Parks 4e420a36c6 Fix for missing LOD spam. 2009-11-07 08:22:39 -06:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Dave Parks 10069e0e13 Fix for prims all being 0 lod.
Fix for dangling prim references.
2009-11-05 19:58:10 -06:00
David Parks 88292104d9 Fix for crash when loading some meshes.
Added button to auto-fill LODs.
2009-11-04 14:19:05 +00:00
David Parks 3e80fa3dbc Sync up with render-pipeline-7 ignore-dead-branch 2009-11-02 19:55:37 +00:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Mark Palange 446c55538e svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Mark Palange fb793870fe QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
Steven Bennetts 4a6bacea0f merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
Steven Bennetts b9b4a4d934 QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Karl Steifvater 52562e2e66 svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
Josh Bell 35b4a91129 svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
Karl Steifvater df4f20d4f5 merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Steven Bennetts 875606a04d QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-11 20:56:42 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
Brian McGroarty d273ba2ce2 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
Brian McGroarty e1e1212daa QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated 2008-05-07 17:17:42 +00:00
Steven Bennetts 16baf6c9d4 merge release-QAR-499 Viewer 1.20 RC 3
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
Josh Bell a089a401ee svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release
Backport fixes made in the production branch to the trunk now that it is live on the grid:
* DEV-14443 Launcher not producing colo prefix when looking up sim class
* DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children
* DEV-12558: Able to make anyone's object shout error messages
* QAR-483 user start location migration prelude
* QAR-490 havok4-6
* Revert havok4-5/4-6 code changes causing parcel access check issues
* Revert QAR-277 sqlite-backbone
* DEV-12357 SEC-53: Script that crashes regions
* QAR-486 New proc and query for Web Classifieds Fix
2008-04-28 19:40:54 +00:00
Dave Kaprielian 16f6d79f76 svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server 2008-04-09 06:12:20 +00:00
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448
2008-04-03 22:50:22 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
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)
2008-04-03 19:21:14 +00:00
James Cook 4c21366d9e Removed assert causing Debug build warnings/errors on Windows. Reviewed with Qarl. OK with Josh. 2008-03-19 22:36:26 +00:00
Steven Bennetts 377ae59c21 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> 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
2008-03-11 01:47:36 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Josh Bell df4d167cd1 svn merge -r74200:76302 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.
2007-12-21 06:44:41 +00:00
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
Steven Bennetts 760f2ceb15 svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
2007-11-08 18:59:20 +00:00
Don Kjer 1b550aaec2 EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
2007-10-11 00:28:42 +00:00
Aaron Brashears 5595a99623 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. 2007-10-04 23:19:43 +00:00
Josh Bell b3d807d5ff svn merge -r 68690:69597 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)
2007-09-13 18:17:52 +00:00
Christian Goetze ce0a5fe145 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
2007-08-21 22:17:53 +00:00
Don Kjer d373dcc7cb svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Kelly Washington 3e9872a297 merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
Brad Kittenbrink 029130bf9c svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release 2007-05-23 21:17:34 +00:00
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
Don Kjer 4ecb9cb63e svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
Josh Bell c93c38e047 svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00