ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 10:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,543 Commits 5 Branches 93 Tags
acfe7e555e41b84ede44db1978dcd23434be580d
Commit Graph

83 Commits

Author SHA1 Message Date
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
Melanie
e398c33648 Add PayPrice to serialization format Xml2 2011-05-25 12:17:46 +01:00
Melanie
932db1c374 Add PayPrice to serialization format Xml2 2011-05-25 11:30:21 +02:00
Melanie
474910c9d6 Merge branch 'master' into careminster-presence-refactor 2011-04-17 18:48:53 +01:00
Justin Clark-Casey (justincc)
58efd761d1 Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test. 
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
 2011-04-13 21:17:43 +01:00
Diva Canto
5c870fce54 Bug fix in object serialization -- sculpt data was wrong. 2011-04-12 19:45:33 -07:00
Diva Canto
eab0951a59 Fixes the issue of hung archives. Problem was with SceneObjectSerializer. 
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
 2011-01-08 15:49:51 -08:00
Melanie
a82112a47c Merge branch 'master' into careminster-presence-refactor 2010-12-17 22:50:25 +00:00
Justin Clark-Casey (justincc)
3d32f05cde remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type. 2010-12-17 22:40:11 +00:00
Melanie
342dc532ec Merge branch 'master' into careminster-presence-refactor 
Also prevent god takes from ending up in Lost and Found
 2010-12-03 02:36:13 +00:00
Diva Canto
f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Diva Canto
ca8d015733 Changed the parser for InventoryItem deserialization. Moved some utility functions around. 2010-11-27 11:40:54 -08:00
Melanie
22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Diva Canto
c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. 
New migration in inventory table in order to make CreatorID varchar(255).
 2010-11-21 17:19:24 -08:00
Diva Canto
6a9ae9e7cb Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority. 
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
 2010-11-21 13:16:52 -08:00
Melanie
98ba079e95 Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory. 2010-11-16 01:35:16 +00:00
Melanie
0f152bfe8c Diva needs a spanking! Serializing OldItemID breaks script state 
persistence in agent inventory.
 2010-11-16 01:33:24 +01:00
Melanie
26f12f479f Merge branch 'master' into careminster-presence-refactor 2010-11-02 22:58:33 +00:00
Diva Canto
9f5ab3b965 Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. 2010-11-02 12:05:24 -07:00
Melanie
05dbe4f2c4 Merge branch 'master' into careminster-presence-refactor 2010-10-27 20:49:27 +01:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Melanie
ac370cf57b Merge branch 'master' into careminster-presence-refactor 2010-10-25 01:24:30 +01:00
Diva Canto
627d1a42fe Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object. 2010-10-23 20:39:41 -07:00
Melanie
fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Diva Canto
8731c2be11 It looks like Vector3s also got written down in lower case at some point in time. Added code to account for that. 
17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and  instead  Line 1, position 2838.
 2010-10-19 15:16:29 -07:00