ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-23 17:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

107 Commits

Author SHA1 Message Date
UbitUmarov
2e54c3cc8f A few more changes to keyframes 2012-08-29 03:19:47 +01:00
UbitUmarov
ef6e007a4c [possible still very broken] mess around keyframes. timer events 
threads overlaps, some null objects exceptions, region crossing...
 2012-08-28 03:21:03 +01:00
Melanie
f2ac1b9e8a Add Camera Offsets to serialization 2012-08-21 16:41:08 +02:00
Melanie
9e00e2ddec Change attachment handling to remove object from the scene first as per 
justincc's original work. Sample scripts before doing so. Also refactor some
crucial common code and eliminate parameters that were only ever used with
the same constant value.
 2012-07-23 21:08:02 +02:00
Melanie
89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +01:00
Melanie
470019b52a Change semantics of FromXML on vehicle data to make the serializer a bit cleaner 2012-07-07 19:59:55 +02:00
Melanie
6535f23e4b Add saving vehicle physics data to the database 2012-07-07 02:05:01 +02:00
Melanie
597f99bca7 Merge branch 'master' into careminster 2012-05-16 12:40:45 +01:00
Justin Clark-Casey (justincc)
23ae24b406 Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). 
Remove buggy Xml2ToSOG().
 2012-05-16 00:10:42 +01:00
Melanie
e7819ce909 Port Avination's collision fixes to core. 2012-05-15 01:02:38 +01:00
Melanie
e3c376156c Completely revamp collision handling. Now works as it is supposed to. 2012-05-14 22:45:54 +02:00
UbitUmarov
cf9ebd301c bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still 2012-03-14 18:24:04 +00:00
UbitUmarov
577d07aa44 missed commit of extraphysics parameters serialization.. 2012-03-13 19:51:41 +00:00
Melanie
fca8c82232 Move KeyframeMotion from SOG to SOP because we can't persist it any 
other way because SOG doesn't technically exist in the DB
 2012-02-26 18:11:38 +01:00
Melanie
8cdc115c91 Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new 
code.
 2012-02-26 14:30:24 +01:00
Melanie
aa552d0526 Serialize Keyframe motion for region crossings 2012-02-26 12:29:35 +01:00
UbitUmarov
e07440d0c5 changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual) 2012-02-25 22:20:25 +00:00
Melanie
4bc3a0ecf4 Uncomment serialization 2012-02-19 20:25:20 +01:00
Melanie
433d5f1d3e Merge branch 'ubitwork' 2012-02-19 20:24:00 +01:00
UbitUmarov
60d68ee312 Vehicle XML serialization more complete. Inactived by coments in SceneObjectSerializar.cs until proper testing 2012-02-19 18:10:00 +00:00
Melanie
985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
Justin Clark-Casey (justincc)
2b842958cc If shape properties fail SOP parsing (e.g. due to commas instead of decimal points) print out one short message listing the failing node names rather than lots of exceptions. 
Adds skeleton bad float values deserialization test
 2012-02-16 02:58:00 +00:00
Melanie
272ba5a741 Merge branch 'master' into careminster 2012-02-15 01:11:17 +00:00
Justin Clark-Casey (justincc)
189c67db95 On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails. 
Logging level was DEBUG before 312e145 (Fri Feb 3 2012).
312e145 also accidentally removed the 'general error' log message if any shape deserialization failed.
This commit restores it, though this has no functional impact.
 2012-02-13 20:43:26 +00:00
Melanie
ce5e900721 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-02-04 11:48:20 +00:00
Justin Clark-Casey (justincc)
312e1457dd Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods. 
Adds ability to submit a customized exception message to match logging.
 2012-02-03 23:47:01 +00:00
Melanie
567f4c51f8 Improve reliability of script state saving by covering various saving 
and loading scenarios which resulted in loss of continuity on item ids
 2012-02-02 01:52:17 +00:00
Melanie
45ad9e39a6 Improve reliability of script state saving by covering various saving 
and loading scenarios which resulted in loss of continuity on item ids
 2012-02-02 01:05:14 +01:00
Melanie
abffda269f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-01-28 04:05:53 +00:00
Justin Clark-Casey (justincc)
154ba0124a Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner. 2012-01-28 02:21:41 +00:00
Diva Canto
8bdd80abfa HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI. 2012-01-12 09:56:35 -08:00
Melanie
4492bc1bcd Merge branch 'master' into careminster 2012-01-12 17:52:29 +00:00
Justin Clark-Casey (justincc)
38db874755 If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception. 2012-01-11 14:33:26 +00:00
Melanie
1ebc9d04aa Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-01-05 08:15:33 +00:00
Dan Lake
0ab2289cdc Access to these static methods to serialize objects are useful outside of serializer 2012-01-03 16:52:08 -08:00
Melanie
6362df1202 Serialize the Volume Detect field 2011-12-05 19:33:25 +01:00
Melanie
243acef917 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-11-03 00:06:14 +00:00
Dan Lake
e2c51a977d Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. 
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".

UpdateFlag and Schedule*Update will both be made private shortly.

UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
 2011-11-02 14:59:00 -07:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
af7c6c5f39 stop passing FromUserInventoryItemID right down into the deserializer. 
the code becomes simpler if this is set from the outside - only one place needs to do this.
 2011-09-02 00:50:16 +01:00
Justin Clark-Casey (justincc)
cf3ffe5bb4 Fix llAttachToAvatar() 
Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay.
So we now don't do this.  The state will be serialized anyway when the avatar normally logs out.
The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state.
 2011-08-24 20:49:23 +01:00
Justin Clark-Casey (justincc)
86f45f6fe7 remove undo state storage in a few places where it's pointless 
no functional effect - existing bugs still remain
 2011-07-19 01:24:43 +01:00
root
c920ff9d1d Merge branch 'master' into careminster-presence-refactor 2011-07-09 01:06:46 +01:00
Justin Clark-Casey (justincc)
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
Melanie
a1c16a4200 Merge branch 'master' into careminster-presence-refactor 2011-06-11 12:08:02 +01:00
Justin Clark-Casey (justincc)
fc7e17baf7 When serializing objects, stop accidentally using the green text colour value for alpha 
This addresses http://opensimulator.org/mantis/view.php?id=5111
 2011-06-10 21:49:25 +01:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Melanie
458a8c6d0b Persist Buoyancy in inventory 2011-06-02 18:44:51 +02:00
Justin Clark-Casey (justincc)
e9988a3728 Make sure culture is en-US when saving archive related xml. 
This might resolve http://opensimulator.org/mantis/view.php?id=5475
 2011-05-27 21:19:20 +01:00
Justin Clark-Casey (justincc)
4e4db749eb If parsing fails in the primitive base shape (which prints out a debug log message), also print out the name and uuid of the part containing this shape. 
This is to help in diagnosing parsing failures.
 2011-05-27 20:59:35 +01:00