905431cf60
merge changes for 3.7.25-release
2015-02-24 15:48:28 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
16e35c5913
MAINT-3959 FIXED Prim size reverting to default size when scaled down and shift copied
2014-10-03 19:42:34 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
9128191713
Disabling the phantom toggle when the object is volume-detect.
2012-07-13 15:26:02 -07:00
8e0d45b4d6
Removing unreferenced headers from the #include list.
2012-06-26 16:32:46 -07:00
f87034c3c2
PATH-760: First pass at Leo's new design for the build floater.
2012-06-20 18:07:04 -07:00
379aff3520
PATH-713: Disabling all editable object fields on the build tools floater when a static pathfinding object is in not in the current region.
2012-06-13 16:57:35 -07:00
0e8ef689ba
Enabling toggle of the Physical attribute for character objects.
2012-06-13 14:10:15 -07:00
42f3648814
PATH-705: First pass at removing the agent state functionality. WIP -- still need to remove XXX_STINSON_AGENT_STATE_DELETE_ME ifdef'ed code.
2012-06-11 18:59:51 -07:00
9252ad10fd
PATH-696: Removing an assert as it is no longer always true.
2012-06-07 12:29:01 -07:00
890c583289
MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker)
...
- Implemented Richard's and Leo's spec
- Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
2012-05-22 20:01:22 +03:00
c1a5d6a36b
PATH-450: Disabling the movement and shape manipulation widgets when editing an item in a linked set.
2012-03-30 15:42:43 -07:00
f90bcb3a55
PATH-442: BUGFIX Disabling the phantom flag in the Build Tools floater for character objects.
2012-03-29 15:00:29 -07:00
22681ddb90
PATH-199: Disabling more functionality of the build tool floater when permanancy is enforced.
2012-03-21 18:00:21 -07:00
b7aa6803a1
PATH-199: Adding a non-interactive checkbox to the build tools floater.
2012-03-21 15:15:59 -07:00
378ae8ce65
PATH-199: Enforcing permanent objects in frozen state to not move.
2012-03-13 15:33:15 -07:00
4d77d3cca1
PATH-199: Cleaning up code related to object flags so that I can better use the flags to managed pathfinding flags such as permanent and character.
2012-02-28 19:07:44 -08:00
d63b72fb53
SH-2347 FIXED selecting the value in Stitching Type drop down.
2011-09-05 20:38:17 +03:00
c70a357a27
SH-2076 FIXED Removed the sculpt type 'None' from edit dialog.
...
If a prim's sculpt type was set to 'None' it is displayed as 'Plane' in the combo box.
2011-08-10 18:59:10 +03:00
c47d42d945
STORM-1315 Ability to do simple math in numeric edit fields
2011-06-29 23:40:20 -07:00
faef58a9b9
SH-1666 Remove "Mesh" stitching type from sculpt combo box.
2011-06-02 01:36:28 -05:00
d8183a71d4
SH-1580 FIXED Disable mesh mirroring in build tools & on server
2011-05-17 18:18:10 -04:00
0e54892173
SH-1352 FIXED Move Material dropdown to Features tab, above Physics settings
2011-05-17 10:55:35 -04:00
241350f845
SH-1205 Lock out ability to change sculpt stitching type or sculpt map when sculpt stitching type
2011-04-12 15:06:21 -07:00
022feaa452
SH-1087 IN-PROGRESS Edit tools do not fit on default sized viewer window
...
First phase check-in. Moved physics code over to features tab.
2011-03-31 18:51:32 -04:00
673801e644
SH-1205 Lock out ability to change sculpt stitching type or sculpt map when sculpt stitching type is set to mesh
2011-03-24 12:31:24 -07:00
74d402e59e
SH-473/CTS-248 Enable mirror and invert check boxes for meshes.
2011-02-23 16:38:10 -06:00
f41f7cb607
SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regions
...
SH-943 10 meters maximum Prim/Mesh size in latest Mesh Viewers
2011-02-16 15:24:11 -08:00
e3ce59b27d
Backed out changeset 4fd25c7614e0
2011-02-10 17:29:29 -08:00
5addce7331
backing out sh-512 changes
2011-02-10 16:26:23 -08:00
09bfb95976
Fix for Sh-512: Scales use their previous maximum value
2011-01-31 16:23:22 -05:00
fefc37e92f
SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc.
2011-01-28 16:39:02 -08:00
f89b8c2685
SH-841 Hide physics parameters in build tools when connected
2011-01-26 17:02:11 -08:00
c1db849c41
SH-635 Fix for changing one physics parameter changing all physics parameters.
2011-01-20 15:50:03 -06:00
ca1c1eea78
SH-808 Selectively enable/disable features in edit tools
2011-01-19 11:38:34 -08:00
a22de1b72a
Re-add convex hull for simple prims and sculpties,
...
as per Falcon's advice
2010-12-13 18:19:53 -08:00
a5ae6f0141
automated merge
2010-12-08 21:27:03 -08:00
1be5133116
SH-541 - Physics mesh display shows inconsistent data.
...
The object UI was allowing the user to set 'prim' physics for meshes for which
no user physics had been uploaded, or decomposed. It defaulted to convex hull in that case.
The fix is to fix the UI to disallow 'prim' for meshes without physics meshes, limiting
those to only convex hull and none.
We will also redo the task validation to detect invalid states related to this as part
of the 'redo the validation' work
2010-12-08 21:24:02 -08:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
58f0e78cb4
Initial work on viewer motion interpolation. Changes include:
...
* InterpolationTime and InterpolationPhaseOut values in settings.xml to control new object interpolation code. Use zero to revert to old logic
* Viewer motion interpolation lasts InterpolationTime and will start to phase out after InterpolationPhaseOut seconds
* Changed LLWorld::getMinAllowedZ() to take a world-position as a parameter
* Added LLVOAvatarSelf::resetRegionCrossingTimer()
* Actually reset LLVOAvatarSelf::mRegionCrossingTimer so we get sensible timing data for region crossings
* LLVOAvatarSelf::updateRegion() will update position value due to region changes
Code reviewed by Ambroff
*
2010-10-12 13:50:17 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
bc4dcef7af
SH-93 Disable mirror/invert check boxes when sculpt type is set to mesh. Also fixed a crash when switching sculpt type from mesh to sphere.
2010-09-22 17:33:17 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
Oz Linden