Dave Parks
1b2c082feb
merge
2011-01-19 23:24:13 -06:00
Dave Parks
32c4a448b1
SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included.
2011-01-19 23:16:53 -06: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
Oz Linden
cf28764477
pulling tags back from beta branch
2011-01-19 16:38:30 -05:00
Dessie Linden
120e64387c
Removed accidental changeset id tag
2011-01-19 12:06:25 -08:00
Dessie Linden
224a63edbe
Removed tag 76f586a8e22b
2011-01-19 12:04:43 -08:00
Dessie Linden
2122c01e48
Added tag 76f586a8e22b, 2.5.0-beta1 for changeset 345b17e7cf63
2011-01-19 12:02:28 -08:00
Dessie Linden
76e82cebb3
Removed tag 76f586a8e22b
2011-01-19 12:01:44 -08:00
Dessie Linden
3ef3f95c4f
Added tag 76f586a8e22b for changeset 76f586a8e22b
2011-01-19 12:00:58 -08:00
leyla_linden
17068766b7
Merge
2011-01-19 11:39:25 -08:00
leyla_linden
ca1c1eea78
SH-808 Selectively enable/disable features in edit tools
2011-01-19 11:38:34 -08:00
leyla_linden
b5e67321c3
SH-821 Selectively show/hide mesh render info
2011-01-19 11:37:42 -08:00
leyla_linden
e9fd322feb
SH-820 selectively enable/disable mesh preferences options
2011-01-19 11:37:17 -08:00
Oz Linden
061b04132d
pull changes back from beta
2011-01-19 12:48:04 -05:00
Oz Linden
fde14fa532
merge changes for storm-243
2011-01-19 10:33:15 -05:00
Kent Quirk
6b7a7081c3
STORM-725: add os to updater query url
2011-01-19 10:28:39 -05:00
Oz Linden
24f73fda0f
remove problematic include used during debug
2011-01-18 15:59:45 -05:00
Dave Parks
ebbaa00ed9
merge
2011-01-18 14:49:38 -06:00
Dave Parks
aeec987f56
SH-571 work in progress.
2011-01-18 14:49:14 -06:00
Merov Linden
b2e4486cf2
Sync with viewer-beta
2011-01-18 11:47:04 -08:00
Merov Linden
6848a27706
pull from viewer-beta
2011-01-18 10:22:57 -08:00
Vadim ProductEngine
fd95de0e79
STORM-243 FIXED Disabled the "You just entered a region using a different server version..." pop-up notification.
2011-01-18 18:46:35 +02:00
Oz Linden
8c2f2eb1f3
make storing the cache obey the same unrefreshed time as other usage
2011-01-18 07:37:56 -05:00
Seth ProductEngine
7461f1ca2b
STORM-383 FIXED Added "Restore Item" context menu entry for landmarks and folders in Trash category in Places->My Landmarks->My Inventory accordion tab.
2011-01-17 19:03:49 +02:00
Paul Guslisty
1ae76ea43e
STORM-484 FIXED The long name is not truncated in Build tools
...
- Decreased height of text box containing name
- Enabled ellipses for these text boxes
2011-01-17 18:01:55 +02:00
Oz Linden
7f58b4f292
merge changes for vwr-24401
2011-01-17 10:39:54 -05:00
Oz Linden
74fdba8295
merge changes for vwr-24420
2011-01-17 10:30:36 -05:00
Kitty Barnett
1d7b46e2c3
VWR-24217: allow Contents folder from object to be dragged to inventory
2011-01-17 10:09:52 -05:00
Oz Linden
e106678422
DN-202: Make avatar name caching more aggressive and error handling more uniform
...
Add logging (mostly at DEBUG level)
2011-01-16 21:41:08 -05:00
Oz Linden
c5d8624ba4
renamed temp name flag member in name cache to avoid confusion with similar names in other classes
2011-01-15 09:09:41 -05:00
callum
903f626935
SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be optimized for Web profile display
2011-01-14 16:15:35 -08:00
Andrew A. de Laix
8e4d6bb1ac
fix CHOP-366, on temporary errors (e.g. version manager returns other than 200) show error dialog instructing the user to manually install the latest viewer.
2011-01-14 12:59:42 -08:00
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