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
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
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
Oz Linden
553e5001e9
merge changes for storm-1462
2011-07-08 12:56:00 -04: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
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
prep
30a80ac486
Fix for SH-1992
2011-07-07 15:32:38 -04: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
Dave Parks
9b253ccf68
SH-1972 Fix for slm messing up physics shape on second upload.
2011-07-06 19:27:43 -05:00
Dave Parks
71eb68a85d
Fix for "set to default" button not resetting some data.
2011-07-06 18:54:50 -05:00
Brad Payne (Vir Linden)
bab80fed2f
merge
2011-07-06 17:39:32 -04:00
Brad Payne (Vir Linden)
5e5b140ed8
merge
2011-07-06 17:39:01 -04:00
Oz Linden
66dcc72870
merge changes for storm-1479
2011-07-06 15:31:36 -04:00
Vadim ProductEngine
3d3ec0a294
STORM-1479 FIXED Duplicated IDs in the Edit Day Cycle floater.
2011-07-06 22:24:22 +03:00
Dave Parks
1a5f978ca8
SH-1988 Fix for using diameter instead of radius for streaming cost.
2011-07-06 12:32:44 -05:00
Seth ProductEngine
74c5c0a0d7
SH-1945 FIXED Added a check for Estate Managership when checking whether an object encroaching on the region can be returned.
2011-07-06 20:05:38 +03:00
Oz Linden
d0f244ac29
merge changes for beta tags
2011-07-06 11:18:34 -04:00
Dave Parks
36a05ebd9a
SH-1951 Partial fix for basic shaders disabled changing terrain appearance.
2011-07-05 17:25:57 -05:00
Vadim ProductEngine
31c1cff64f
STORM-1262 FIXED Removed the original Windlight Region Settings implementation.
2011-07-06 00:42:28 +03:00
Dave Parks
749b48523a
SH-1951 Fix for show land owners not working when basic shaders enabled.
2011-07-05 16:36:49 -05:00
Vadim ProductEngine
d349352740
STORM-1330 WIP Removing a comment that was added by mistake.
2011-07-05 23:25:08 +03:00
Vadim ProductEngine
02c9c49788
STORM-1330 WIP Override region sun position when switching the region to fixed sky.
2011-07-05 22:52:31 +03:00
Dave Parks
de37474429
SH-1918 Fix for highlight transparent not working when basic shaders enabled.
2011-07-05 13:59:32 -05:00
seth_productengine
5f17754a39
SH-1965 FIXED recalculating physics in model upload wizard before requesting the upload fee.
2011-07-05 21:21:26 +03:00
Brad Payne (Vir Linden)
b466e95b4d
merge cleanup
2011-07-05 14:11:16 -04:00
Debi King (Dessie)
b48b8ed648
Added tag DRTVWR-69_2.7.5-beta1, 2.7.5-beta1 for changeset 09984bfa6cae
2011-07-05 13:36:55 -04:00
prep linden
e2ddeb5e5f
Fix for SH-1604: missing convex stub license
2011-07-05 13:27:58 -04:00
Brad Payne (Vir Linden)
d8d1587d49
merge
2011-07-05 13:15:58 -04:00
Dave Parks
d50093cb42
SH-1926 Fix for blocking legitimate sculpt maps with over-eager area check.
2011-07-05 11:51:32 -05:00
Vadim ProductEngine
7aa7ee6838
STORM-1330 WIP Switched the Terrain tab of the Region/Estate floater to using the region info model.
2011-07-05 17:51:22 +03:00
Don Kjer
ec402fad16
SH-1747 mesh-asset-dep -- uploaded objects have bad permissions, and SH-1975 Name of mesh is not loaded into mesh uploader floater. Also removed a lot of dead mesh uploader code.
2011-07-03 01:02:01 -07:00
Kadah_Coba
b46f89e280
VWR-25753 Searching in the world map clears the destination arrow but not the destination beacon
2011-07-01 17:15:51 -07:00
Brad Payne (Vir Linden)
cae0915ee6
merge
2011-07-01 17:32:22 -04:00
Brad Payne (Vir Linden)
3cca342ffb
SH-1790 FIX - use the inventory flags returned by server when available
2011-07-01 17:31:53 -04:00
Nyx (Neal Orman)
d2fe45b877
Automated merge with https://bitbucket.org/seth_productengine/mesh-development
2011-07-01 16:41:52 -04:00
Nyx (Neal Orman)
8accd2cc04
SH-1725 SH-1726 FIX mesh upload wizard & advanced don't handle upload errors gracefully
...
Restructured the code to be a bit cleaner, now have callbacks with appropriate functionality
in both the wizard and advanced uploaders. If the upload fails, it requires the user to
re-submit the recalculate request.
2011-07-01 16:39:49 -04:00
Vadim ProductEngine
424366a66f
STORM-1137 FIXED Close the REGION/ESTATE floater when teleporting.
2011-07-01 21:11:36 +03:00
Dave Parks
a5a23c3695
merge
2011-07-01 12:25:38 -05:00
Dave Parks
03d22f5366
SH-1913 Fix for PE cost not updating appropriately when editing child prims of a linked set.
2011-07-01 12:24:52 -05:00
Vadim ProductEngine
2fc65cae7b
STORM-1464 FIXED Fixed inability to change terrain settings.
...
Reason:
The "setregionterrain" message missed estate/region sun info and thus was incomplete.
Fix:
Added missing fields back.
Note:
The fields' values are fake.
2011-07-01 20:05:49 +03:00
Vadim ProductEngine
3a552f5b8b
STORM-1464 WIP Removed references to a nonexistent Apply button from the Region/Estate floater.
2011-07-01 17:33:57 +03:00
Brad Payne (Vir Linden)
021ce5ccaf
enabled mesh
2011-07-01 09:42:06 -04:00