15dd033490
primbasicshape: convert eventual MeshEP to SculpEP
2019-04-30 22:52:58 +01:00
0cf5876c45
update pbs
2018-12-28 13:28:25 +00:00
cebe40f5cd
ooops
2018-11-17 20:27:09 +00:00
f6d4fadb0a
a few more changes to pbs
2018-11-17 20:22:15 +00:00
87a723cbc8
code aesthetics and simplification
2018-11-17 18:52:16 +00:00
029d6e40f6
remove those xml things no longer needed on .net >4.5.2
2018-01-17 04:18:43 +00:00
e908c0ecad
give up on a property that old monos do compile, but then smore ok exec
2018-01-09 19:47:10 +00:00
eec3921800
fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one
2018-01-08 12:00:21 +00:00
89a690c11f
a few more xml things
2018-01-05 12:24:07 +00:00
3fb61f4470
mantis 8258: change Mesh basic shape pathScaleY in case of Torus
2017-10-30 18:26:15 +00:00
2247251c2f
bug fix: Of course i had to pick a wrong number for profileBegin
2017-09-16 18:58:10 +01:00
05da6b9f14
bug fix. Increase the values of profileHollow and profileBegin used to match pbs number of faces and the Mesh number of faces. The small values i used before seem to be randomly lost.
2017-09-16 00:19:58 +01:00
ef2fd8fcea
keep the reverted code, that does work. Our code likes to have pbs.Media == null when there is no MOAD defined, so handle possible odd oars that may have llsd <array /> on that case
2017-06-08 20:47:51 +01:00
7c5376f224
move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShape.cs
2017-04-25 14:21:01 +01:00
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
2dc92e7de1
Preserve attachment point & position when attachment is rezzed in world
...
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.
Fixed to apply to r/23314 commit
ba9daf849e
2013-09-22 21:10:01 -05:00
069e587841
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
2013-02-10 00:17:14 +00:00
745ef40153
Fixed ReadSculptData(): the check whether there are enough bytes to read was incorrect
2013-02-09 02:04:26 +00:00
2cb824d3fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-12-07 03:49:04 +00:00
0f3ebe0971
Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce code complexity
2012-12-05 22:12:45 +00:00
b60c6bc3f8
Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this is ignored by the ExtraParams properly anyway
2012-12-05 22:01:47 +00:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
4032455332
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
2012-05-07 00:33:50 -07:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
18037d41c4
Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:50:54 -04:00
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
d79c6c8820
Rename SetSculptData() to SetSculptProperties(), since this is what it does (setting SculptData is done through the property)
2011-07-09 00:42:48 +01:00
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
06b61b68c7
Adding osFunctions for light projection
...
Set the projection parameters in the host prim ...
osSetProjectionParam(bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Set the projection parameters in a target prim ...
osSetProjectionParam(ikey target uuid,
bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Threat Level very high
Signed-off-by: Melanie <melanie@t-data.com>
2010-10-17 09:52:12 +01:00
9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
dd1058e6b3
Adding projected light filters to prim propeties
...
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 09:46:49 -04:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
...
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
2010-08-03 17:09:20 +01:00
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
...
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
...
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
2010-08-03 15:45:49 +01:00
412fed975f
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
6f4d4543b9
Make newly created prims be named "Object" and make newly created scripts
...
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
UbitUmarov