Commit Graph

16307 Commits (293b35f000ca4e8a4bcf85dc4782b2a72d1887ea)

Author SHA1 Message Date
prep linden eec6071766 merge 2011-01-14 15:30:57 -05:00
Loren Shih 645da31dd7 Automated merge up from viewer-development 2011-01-14 15:16:37 -05:00
Loren Shih 671336c727 Automated merge from mesh-development 2011-01-14 15:16:21 -05:00
Loren Shih 5364bb5a11 Mesh-development work in progress 2011-01-14 15:16:17 -05:00
prep linden a678ff80af voice dot is positioned consistently 2011-01-14 15:00:19 -05:00
Loren Shih d82da834fa Automated merge up from viewer-development 2011-01-14 14:16:07 -05:00
Merov Linden 7314ad41be STORM-830 : pull into viewer-development 2011-01-14 10:28:29 -08:00
Nyx (Neal Orman) 53d03606f1 SH-557 FIX meshes sometimes don't load in a region
Found that we were storing an empty string as a getMesh capability in the case that
we checked for the new url before getting the list of caps from the server
after a teleport. Made sure we didn't overwrite the caps url until we have the
list of caps for the new region after teleport.

Will be post-reviewed by davep
2011-01-14 13:23:14 -05:00
Paul Guslisty 8864a1b4db STORM-834 FIXED Color picker remains opened after 'Undo changes' button was pressed on 'Edit weareble' panel
- Close color picker after color swatch's value updated
2011-01-14 18:10:46 +02:00
Oz Linden 939e8d8f74 Automated merge with file:///Users/oz/Work/V-D 2011-01-13 17:10:20 -05:00
Joshua Bell dee9c80862 merged 2011-01-13 12:16:54 -08:00
Joshua Bell 20b983afe0 VWR-24401 Show TOS and other login dialogs when --login is used 2011-01-13 11:52:58 -08:00
Merov Linden ce55885aa3 Pull sync to viewer-development 2011-01-13 11:30:56 -08:00
Merov Linden a4e775e54c STORM-477 : backout changeset 959f9340da92 2011-01-13 11:17:04 -08:00
Merov Linden 804495ad41 STORM-477 : backout changeset 6f5cb303d3e2 2011-01-13 11:15:47 -08:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Loren Shih e7f068c37e Automated merge from mesh-development 2011-01-13 10:23:47 -05:00
Paul Guslisty ad555098bf STORM-832 FIXED Two Roles are selected after made changes in one
- Clear selection from role that was changed
2011-01-13 16:52:25 +02:00
Don Kjer 756a4e26da Merge with viewer-development 2011-01-12 19:00:36 -08:00
Loren Shih e47ff7bd47 SH-717 Viewer crash on exit after Upload model dialog could not be spawned
Took out unused function that was seen in crash report from this bug.  No functionality change.
2011-01-12 17:35:31 -05:00
leyla_linden d51d294296 Merge 2011-01-12 13:44:55 -08:00
leyla_linden 3a47555dc2 SH-777 Wizard top buttons need to be clickable and switch between wizard steps 2011-01-12 13:38:47 -08:00
prep linden c5de64467f Fix for Sh-780 and tweak for nametag height (Sh-638). 2011-01-12 16:11:51 -05:00
Merov Linden 55322713fc STORM-720 : pull in viewer-development 2011-01-12 12:09:49 -08:00
Merov Linden 720f578ab1 STORM-387 : pull in viewer-development 2011-01-12 12:08:30 -08:00
Merov Linden 038b38c446 STORM-477 : pull in viewer-development 2011-01-12 12:07:03 -08:00
Merov Linden c020c5c0f3 STORM-723 : pull in viewer-development 2011-01-12 12:01:44 -08:00
Merov Linden db8b7a2198 STORM-702 : pull in viewer-development 2011-01-12 11:49:42 -08:00
Merov Linden 40cd81f423 STORM-615 : pull in viewer-development 2011-01-12 11:18:19 -08:00
Merov Linden 713858d6aa STORM-514 : pull in viewer-development 2011-01-12 11:14:17 -08:00
Merov Linden c6895302ed STORM-797 : pull in viewer-development 2011-01-12 11:12:56 -08:00
Merov Linden 3fa2218838 STORM-393 : pull in viewer-development 2011-01-12 11:11:17 -08:00
Merov Linden 76b7bc1a4b STORM-385 : pull in viewer-development 2011-01-12 11:09:46 -08:00
Merov Linden e3fb72f547 STORM-370 : pull in viewer-development 2011-01-12 11:07:56 -08:00
Jonathan Yap e27ae655c6 STORM-844 Minor adjustment to contributions.txt 2011-01-12 10:37:15 -05:00
Jonathan Yap 3703f0bb0d STORM-844 "More" should be "Less" when Media Control is open 2011-01-12 08:24:38 -05:00
Richard Linden 7a1d7d15b9 STORM-823 FIX Tab Key not working properly
set focus root to true by default for all floaters via floater.xml template
existing calls to setIsChrome will turn off focus root for chrome floaters after initializing it from the focus_root parameter
2011-01-11 16:56:05 -08:00
Brad Payne (Vir Linden) 86482ce1d7 merge 2011-01-11 16:42:24 -05:00
Brad Payne (Vir Linden) 997c0d3924 SH-742 FIX, SH-743 FIX: now treat requesting a specific triangle limit differently from changing some other LOD parameter, to avoid successive simplification problem 2011-01-11 16:39:28 -05:00
Seth ProductEngine 4af9db7b79 STORM-477 FIXED Re-implemented LLDir::getNextFileInDir() as an iterator object.
- Replaced all existing usages of LLDir::getNextFileInDir() with the new directory iterator object.
- Removed platform specific LLDir::getNextFileInDir() implementation.
2011-01-11 19:50:58 +02:00
Merov Linden aab5759467 STORM-807 : pull into viewer-development 2011-01-11 09:03:18 -08:00
Vadim ProductEngine e3e1d9b4c3 STORM-715 FIXED Don't expand default ("Clothing") accordion tab when docking/undocking the Appearance SP.
There is a side effect: we don't reset the accordion when switching between sidepanels anymore.
But I guess it's ok because other sidepanels (People, Me) don't reset their state either
(e.g. if you open a group profile, then switch to My Inventory, then back to People,
the group profile will still be opened).
2011-01-11 18:55:22 +02:00
Merov Linden c8457f2664 STORM-807 : Clean up code as discussed with Andrew 2011-01-10 18:01:16 -08:00
Merov Linden 8e3c9b1273 pull from viewer-beta 2011-01-10 15:10:11 -08:00
Jonathan Yap d67f04da83 STORM-830 Per Aleric's and Q's suggestion set initial value of mInternalGain to -1 2011-01-10 17:24:34 -05:00
prep 3fcdd7f415 merge 2011-01-10 16:08:02 -05:00
prep 9c60d1da81 Fix for SH-638 2011-01-10 16:07:03 -05:00
Vadim ProductEngine ac877d1a70 STORM-720 ADDITIONAL_FIX Typo in PT locale 2011-01-10 22:29:29 +02:00
Vadim ProductEngine 97dea390ec STORM-720 FIXED Disabled highlighting URLs in inventory items names in the share confirmation dialog. 2011-01-10 22:25:22 +02:00
leyla_linden b63a404613 Merge 2011-01-10 12:10:36 -08:00