Brad Payne (Vir Linden)
77e2be7984
SH-2043 FIX
2011-07-12 14:35:32 -04:00
Xiaohong Bao
b8351e83e8
fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"
2011-07-11 17:51:16 -06:00
prep
4b3ed516fc
Fix for sh-1982 and sh-2025
2011-07-11 14:55:07 -04:00
prep
b905b231c9
merge
2011-07-11 13:52:46 -04:00
prep
572a1734a5
SH-2012: removed upload wizard from inventory '+' menu
2011-07-11 13:51:20 -04:00
Brad Payne (Vir Linden)
80e60371f8
Fix for linux build failure, hopefully
2011-07-11 11:33:05 -04:00
Dave Parks
97ba99b3c0
merge
2011-07-10 00:18:04 -05:00
Don Kjer
782c8a48f1
Added L$ price breakdown for model uploads
2011-07-09 19:50:36 -07:00
Dave Parks
33cf789134
merge
2011-07-09 17:01:59 -05:00
Dave Parks
29d5413ea6
SH-2007 Code cleanup, expand minimum header size to 4KB, better comments around magic numbers, remove dead calcResourceCost
2011-07-09 17:01:33 -05:00
Don Kjer
121c4034db
Merge
2011-07-09 14:58:31 -07:00
Don Kjer
7029c8ff53
Fix for SH-2028. Also fixed layout issues with new upload warning and upload price text when floater is resized.
2011-07-09 14:58:14 -07:00
Brad Payne (Vir Linden)
961d5b1d65
merge
2011-07-09 11:05:29 -04:00
Oz Linden
b40a44d24d
increment version to 2.8.0
2011-07-09 07:58:11 -04:00
Dave Parks
7b102270f5
SH-2007 Don't eat an entire core when uploading meshes or requesting fee information.
2011-07-08 23:32:30 -05:00
Dave Parks
dd6547a55e
merge
2011-07-08 23:22:07 -05:00
Dave Parks
dc7100a63f
SH-2008 Fix for crash when generating normals on objects with no texture coordinates.
2011-07-08 23:21:51 -05:00
Oz Linden
9ee4051df0
merge changes for storm-1491
2011-07-08 22:10:07 -04:00
Don Kjer
e63dd834ab
Merge viewer-development -> mesh-development
2011-07-08 18:26:08 -07:00
Don Kjer
b9d6b5ef9a
Merge viewer-development -> mesh-development
2011-07-08 18:25:07 -07:00
Oz Linden
093fdcfcd3
merge changes for storm-1489
2011-07-08 20:16:35 -04:00
simon@lindenlab.com
bef014ad2a
ER-910 cleanup: removed a stale comment, tweaked text in About Land dialog
...
Options tab.
2011-07-08 15:41:55 -07:00
Richard Linden
255fc0401e
EXP-990 FIX Cannot select from Texture picker for Groups profile pic
...
reviewed by Leslie
2011-07-08 15:31:24 -07:00
prep linden
615cc856a8
Fix for sh-2016 Removed extra char
2011-07-08 16:17:34 -04:00
prep linden
4bc77c5503
Fix for sh-2016
2011-07-08 16:15:26 -04:00
Oz Linden
187bc52114
merge changes for storm-1484
2011-07-08 16:09:59 -04:00
Oz Linden
12bf89626d
merge changes for vwr-25753
2011-07-08 16:07:56 -04:00
Leslie Linden
884f89cb70
EXP-983 FIX -- Viewer crashes around Place Profile and Landmarks listing in Viewer Experience
...
Drag and drop for LLFolderView now handles the empty mFolders case.
2011-07-08 10:24:58 -07:00
Oz Linden
553e5001e9
merge changes for storm-1462
2011-07-08 12:56:00 -04:00
Leslie Linden
7bed421611
Disabling outbox panel display logic for the time being.
2011-07-08 09:23:37 -07:00
prep linden
48c0d9c517
Fix for sh-2012 removed upload wizard option
2011-07-08 11:43:04 -04:00
Oz Linden
ccb3ad9000
merge changes for storm-1485
2011-07-08 09:25:41 -04:00
simon@lindenlab.com
1cf5ce3a43
Merge latest from viewer trunk
2011-07-07 17:46:18 -07:00
simon@lindenlab.com
f5bd2109c2
Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"
...
and muck with the "About Land" Options tab one more time.
2011-07-07 17:42:54 -07:00
Dave Parks
67fbe61531
merge
2011-07-07 18:39:02 -05:00
Dave Parks
c2e93ef931
SH-1774 Remove misleading "Debug" comment -- this code performs a function.
2011-07-07 18:38:45 -05:00
Dave Parks
2a6e18d147
SH-1774 Fix for preserving material assignments between multiple custom LoDs.
2011-07-07 18:32:42 -05:00
Richard Linden
88a90aabcb
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-07 13:34:13 -07:00
Leslie Linden
8f7579e4e4
Merge
2011-07-07 12:59:25 -07:00
Leslie Linden
8e9fd4bdf2
EXP-985 FIX -- Always show Inbox panel if "Received Items" folder exists
...
The presence of the inbox folder now forces the "Received Items" folder to be visible.
The same logic applies to the outbox as well.
Reviewed by Richard.
2011-07-07 12:58:06 -07:00
Leslie Linden
e4bb8a442d
EXP-984 FIX -- My Inventory listing scrolls to bottom when Received Items panel is loaded with several items present
...
* Updated initial view setup to clear selection from "My Inventory" or the root folder after opening it.
Reviewed by Richard.
2011-07-07 12:54:08 -07:00
prep
30a80ac486
Fix for SH-1992
2011-07-07 15:32:38 -04:00
Richard Linden
1f98fc8f6e
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-07-07 12:26:09 -07:00
Richard Linden
5302a9c67a
EXP-847 FIX As a user, I would like to see the How To floater appear the first time I log in to basic mode
...
turned off save_rect for basic mode help window so it isn't influenced by resizing window in advanced mode
2011-07-07 12:26:00 -07:00
Richard Linden
674d8522a1
EXP-847 FIX As a user, I would like to see the How To floater appear the first time I log in to basic mode
...
made help window not appear on login for advanced mode
made help window visibility state properly persist in advanced mode
2011-07-07 12:11:30 -07:00
Leslie Linden
791da71c3e
EXP-983 FIX -- Viewer crashes around Place Profile and Landmarks listing in Viewer Experience
...
* Fixed up some funny use of objects that had already been deleted.
Reviewed by Richard.
2011-07-07 10:37:50 -07:00
Vadim ProductEngine
27afebcae1
STORM-1484 FIXED Restored Apply button in the Estate tab of the REGION / ESTATE floater.
2011-07-07 20:37:32 +03:00
prep
681eb7ba06
Fixes for SH-1994 and SH-2009
2011-07-07 11:35:49 -04:00
Richard Linden
77e99e0887
EXP-983 WIP potential fix for crash when using Place Profile in viewer experience
2011-07-06 20:01:12 -07:00
Richard Linden
fabb46db1e
EXP-940 FIX Make search button on by default in advanced mode
2011-07-06 19:10:32 -07:00