Commit Graph

14725 Commits (e58cbfa53ee62a53e19e7160d741e84e2a8ee67d)

Author SHA1 Message Date
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
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
Xiaohong Bao 0edcdc42f2 Automated merge with http://hg.secondlife.com/viewer-development 2011-02-01 17:55:33 -07:00
Merov Linden fb3ba97f93 STORM-484 : pull in viewer-development 2011-02-01 16:54:29 -08:00
Xiaohong Bao 436fe6a412 fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially) 2011-02-01 17:53:25 -07:00
Xiaohong Bao 2dbbf6bdb8 fix for SH-891: crash at LLDrawable::getFace(int) 2011-02-01 16:01:44 -07:00
Eli Linden 11efdf9381 CT-635 FIX DA and FR translation 2011-02-01 14:28:13 -08:00
Dave Parks 105872b94e merge 2011-02-01 15:35:56 -06:00
Eli Linden 15cdfda6bc Sync with viewer-beta 2011-02-01 12:17:50 -08:00
paul_productengine 1651190c80 STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg)
- Added filter "jpg" for "Save As..." dialog so that *.jpg files can be seen as well as *.jpeg.
2011-02-01 18:39:24 +02:00
Oz Linden f0074f1002 merge changes back from beta branch 2011-02-01 07:22:32 -05:00
Dave Parks 2d04379bea merge 2011-02-01 02:06:53 -06:00
Dave Parks d3bfbd8ebb SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects. 2011-02-01 02:06:36 -06:00
Kent Quirk 1aa01ad67f Merge 2011-01-31 19:29:18 -05:00
Kent Quirk c620550433 VWR-22024 -- apply Bao's patch to beta 2011-01-31 19:18:58 -05:00
Oz Linden 8e31ef838b merge changes for storm-934 2011-01-31 13:04:57 -05:00
paul_productengine 1a1d5f4c00 STORM-507 FIXED User that has sent p2p call invitation to other user, is not added to Recent tab
- Add the caller to the Recent List just after Incoming Call floater appears. Before recicpient accepted or rejected the call.
2011-01-31 19:47:50 +02:00
Oz Linden 34078b34e4 pull changes for STORM-940 and CHOP-369 2011-01-31 12:46:58 -05:00
Oz Linden ed308d15bf merge changes for storm-845 2011-01-31 12:34:17 -05:00
Oz Linden cb6d59513e merge changes for storm-829 2011-01-31 12:32:57 -05:00
Oz Linden bbb4fb10a5 merge changes for storm-643 2011-01-31 12:26:23 -05:00
Oz Linden dd859c5e3e merge changes for storm-351 2011-01-31 12:25:35 -05:00
Oz Linden 64f153d547 Automated merge with file:///Users/oz/Work/V-D 2011-01-29 15:35:54 -05:00
Oz Linden 2e2d990eb1 correct DOS line endings 2011-01-29 13:09:55 -05:00
Xiaohong Bao 125e216603 Automated merge with http://hg.secondlife.com/viewer-development 2011-01-28 21:23:35 -07:00