Commit Graph

14758 Commits (1f0cc074823b299ed77b3d6e90e4e8f4ea60415f)

Author SHA1 Message Date
Xiaohong Bao 1f0cc07482 fix an assert error 2011-02-23 12:41:33 -07:00
Xiaohong Bao bfa25219b8 Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool 2011-02-23 11:10:13 -07:00
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -07:00
Xiaohong Bao ff5e3f5c2e Automated merge with http://hg.secondlife.com/viewer-development 2011-02-15 15:43:47 -07:00
Xiaohong Bao f13884e528 partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-15 14:12:58 -07:00
Oz Linden 3555849644 bump version number to 2.7.0 2011-02-14 16:58:46 -05:00
Oz Linden 068253b2fb Added tag 2.6.0-start for changeset 92e58e51776a 2011-02-14 16:57:10 -05:00
Merov Linden e15b543dd6 STORM-975 : pull into viewer-development 2011-02-11 17:42:37 -08:00
Merov Linden 58d8b666c2 STORM-833 : pull into viewer-development 2011-02-11 17:40:48 -08:00
Oz Linden 924be3f25c pull back release tag from viewer-beta 2011-02-11 11:38:27 -05:00
Dessie Linden 40abc0fe1e Added tag 2.5.0-release, DRTVWR-31_2.5.0-release for changeset b723921b5c71 2011-02-11 08:08:00 -08:00
Merov Linden 547b40bfc8 STORM-986 : Fix for Linux build 2011-02-10 11:56:06 -08:00
callum 6a5d194526 STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows systems 2011-02-10 11:51:53 -08:00
Merov Linden 76cb9a7796 STORM-986 : pull into viewer-development 2011-02-09 20:18:26 -08:00
Merov Linden b82f2c4e4d pull from viewer-development 2011-02-09 15:10:26 -08:00
Seth ProductEngine 65e88ce61d STORM-833 FIXED "i" button overlapping text in name list controls like Group Members list. 2011-02-10 00:34:54 +02:00
Xiaohong Bao b6571ee127 Automated merge with http://hg.secondlife.com/viewer-development 2011-02-09 12:16:00 -07:00
Xiaohong Bao 8d43cb2701 trivial: remove some redundant code. 2011-02-09 12:15:21 -07:00
callum 0ea1b472c6 Additional fix for llmediaplugintest compilation failure after fix for VWR-21275 2011-02-09 10:12:20 -08:00
Xiaohong Bao 54cced2356 debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight 2011-02-09 10:33:07 -07:00
Merov Linden e58cbfa53e STORM-601 : pull into viewer-development 2011-02-08 22:26:03 -08:00
Merov Linden 300c79e7af STORM-433 : pull into viewer-development 2011-02-08 22:25:10 -08:00
Merov Linden 1c47a23d6b STORM-507 : pull into viewer-development 2011-02-08 22:24:26 -08:00
Merov Linden 47642e96f9 STORM-953 : pull into viewer-development 2011-02-08 22:23:32 -08:00
Merov Linden 6ba900073f STORM-955 : pull into viewer-development 2011-02-08 22:22:25 -08:00
Merov Linden 2a13dc7930 STORM-960 : pull into viewer-development 2011-02-08 22:21:15 -08:00
callum 7e6ce12a17 VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the current working
Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08 15:37:12 -08:00
Jonathan Yap 979cd0300f STORM-975 forgot to update contributions.txt 2011-02-07 11:55:17 -05:00
Jonathan Yap 3b246d3182 STORM-975 Duplicated menu entry Develop/Ui/Region Debug Console 2011-02-06 18:26:47 -05:00
Merov Linden 09b009fc23 STORM-610 : Backing out that change (test fail) 2011-02-04 16:38:26 -08:00
Merov Linden 6371ce7727 Clean up license headers in a handfull of files 2011-02-04 15:38:15 -08:00
Merov Linden a8952915e3 STORM-655 : Pull into viewer-development 2011-02-04 15:26:14 -08:00
Merov Linden 422174a804 STORM-610 : Pull into viewer-development 2011-02-04 15:25:10 -08:00
Seth ProductEngine 2c911fce8a STORM-601 FIXED Color swatch now receives focus on mouse click. 2011-02-04 23:22:42 +02:00
Seth ProductEngine 287c3fcffc STORM-433 FIXED Fixed reshaping notification panel with friendship offer when it is inserted into IM chat. 2011-02-04 21:01:01 +02:00
Vadim ProductEngine 6c76421814 STORM-465 FIXED Made all keys localizable.
Renamed HUD direction strings ("Left", "Right", "Up", "Down") to avoid strings duplication.
2011-02-04 16:41:52 +02:00
Merov Linden e82fb8c7b9 STORM-513 : pull into viewer-development 2011-02-03 14:09:02 -08:00
Merov Linden 3feb97487a STORM-397 : pull into viewer-development 2011-02-03 14:06:51 -08:00
Merov Linden e9630662f4 STORM-316 : pull into viewer-development 2011-02-03 14:04:52 -08:00
Merov Linden 4df842eb35 Pull from viewer-beta 2011-02-03 13:42:08 -08:00
Dessie Linden 22fb0f0fa6 Added tag 2.5.0-beta3, DRTVWR-34_2.5.0-beta3 for changeset b723921b5c71 2011-02-03 13:29:45 -08:00
Jonathan Yap 38b228ad18 STORM-953 Clarify what happens when you uncheck Allow Public Access
Note: This change also incorporates STORM-960
2011-02-02 18:41:11 -05:00
Jonathan Yap df05f01fcd STORM-960 Descriptive text missing next to first checkbox in About Land/Access
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
2011-02-02 18:36:42 -05:00
Merov Linden b15b43b14e Merge with viewer-development 2011-02-02 15:06:06 -08:00
Merov Linden dca34a56d2 STORM-435 : pull into viewer-development 2011-02-02 15:04:27 -08:00
Merov Linden 7cac604dbd Pull from viewer-beta 2011-02-02 14:58:16 -08:00
Merov Linden 70aceaaa95 STORM-957 : pull in viewer-beta (da and fr localization) 2011-02-02 14:56:05 -08:00
Xiaohong Bao 515ccf300c Automated merge with http://hg.secondlife.com/viewer-development 2011-02-02 12:43:15 -07:00
Xiaohong Bao 9ba8087a00 fix for Sh-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files 2011-02-02 12:42:59 -07:00
Merov Linden 8f253a33e8 Sync with viewer-development 2011-02-01 17:58:50 -08:00