Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 | |
|\ \ | ||||||
| * | | Change some exception to use ToString(). e.Message is not sufficient to fix | Melanie | 2010-10-22 | 1 | -3/+3 | |
| | | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps! | |||||
* | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -7/+2 | |
|/ / | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
* | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 2 | -2/+7 | |
|\ \ | ||||||
| * | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -2/+5 | |
| | | | ||||||
| * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 | |
| |/ | ||||||
* | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+35 | |
| | | ||||||
* | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-22 | 2 | -9/+3 | |
|/ | ||||||
* | It looks like Vector3s also got written down in lower case at some point in ↵ | Diva Canto | 2010-10-19 | 1 | -3/+3 | |
| | | | | | | 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. | |||||
* | Another take related to the previous commit. | Diva Canto | 2010-10-19 | 1 | -13/+17 | |
| | ||||||
* | Added code to quaternion deserialization to try to cope with an exception ↵ | Diva Canto | 2010-10-19 | 1 | -4/+15 | |
| | | | | | | seen in Wright Plaza related to SitTargetOrientation. 17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064. | |||||
* | Added TextureAnimation and ParticleSystem to serialization. | Diva Canto | 2010-10-19 | 1 | -0/+27 | |
| | ||||||
* | COmmented the wrong line instead, now I commented them all to be on the safe ↵ | Melanie | 2010-10-19 | 1 | -2/+2 | |
| | | | | side | |||||
* | Comment a spammy debug message in the serializer | Melanie | 2010-10-19 | 1 | -1/+1 | |
| | ||||||
* | Deleted all [XmlIgnore] from SOP, since those are meaningless now. | Diva Canto | 2010-10-17 | 2 | -58/+58 | |
| | ||||||
* | .NET automagical serialization of SOPs replaced by manual serialization ↵ | Diva Canto | 2010-10-17 | 2 | -59/+21 | |
| | | | | across the board. | |||||
* | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵ | Diva Canto | 2010-10-15 | 4 | -123/+157 | |
| | | | | old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. | |||||
* | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵ | Diva Canto | 2010-10-14 | 2 | -105/+164 | |
| | | | | to be generating xml's that are successfully parsed. Needs more testing. | |||||
* | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 | |
| | ||||||
* | Comment a debug message so that it doesn't spew the console upon ↵ | Diva Canto | 2010-10-13 | 1 | -1/+1 | |
| | | | | encountering unknown xml elements. | |||||
* | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵ | Diva Canto | 2010-10-13 | 2 | -7/+1381 | |
| | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet. | |||||
* | Change the part for sound playback to be the root part / object UUID instead | Melanie | 2010-10-10 | 1 | -8/+8 | |
| | | | | of the child prim because using the child prim plain doesn't work. | |||||
* | Guard against locking a nullref to avoid build break | Melanie | 2010-10-08 | 1 | -0/+3 | |
| | ||||||
* | Change the order of actions to address a possible nullref | Melanie | 2010-10-08 | 1 | -3/+2 | |
| | ||||||
* | Fix autoreturn to not return zero objects | Melanie | 2010-10-07 | 1 | -6/+2 | |
| | ||||||
* | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 4 | -40/+18 | |
| | ||||||
* | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 1 | -1/+1 | |
| | | | | functional | |||||
* | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 1 | -0/+2 | |
| | ||||||
* | Formatting cleanup. | Jeff Ames | 2010-10-04 | 3 | -4/+4 | |
| | ||||||
* | I really have to say it again and again: e.Message is NOT enough data for | Melanie | 2010-10-03 | 1 | -2/+1 | |
| | | | | | | troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must be used. Fix one more instance of that cr.p | |||||
* | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 1 | -2/+2 | |
| | ||||||
* | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -2/+2 | |
| | | | | original patch | |||||
* | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -2/+2 | |
| | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | |||||
* | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -2/+2 | |
| | ||||||
* | Fix an inventory fetch issue | Melanie | 2010-09-30 | 1 | -0/+3 | |
| | ||||||
* | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 | |
| | ||||||
* | Fix build break | Melanie | 2010-09-27 | 1 | -37/+38 | |
| | ||||||
* | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-27 | 1 | -3/+11 | |
| | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | |||||
* | Restrict inventory items added in a transaction to folder belonging | Melanie | 2010-09-27 | 1 | -0/+6 | |
| | | | | to the connected client. | |||||
* | Add UUID to physics prim name parameter so that diagnostic messages can be ↵ | Justin Clark-Casey (justincc) | 2010-09-25 | 2 | -3/+3 | |
| | | | | | | made more useful. If a separate UUID parameter is better for the future then this can be added later on. | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-25 | 1 | -10/+0 | |
|\ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-21 | 2 | -2/+41 | |
| |\ | ||||||
| * | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -10/+0 | |
| | | | ||||||
* | | | If the uuid gatherer fails to find the asset containing gesture metadata, ↵ | Justin Clark-Casey (justincc) | 2010-09-24 | 1 | -0/+7 | |
| |/ |/| | | | | | | | | | | | then simply return rather than generating an exception This matches existing behaviour, though better diagnostics for missing assets may be good later on. This addresses http://opensimulator.org/mantis/view.php?id=4977 | |||||
* | | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵ | Justin Clark-Casey (justincc) | 2010-09-21 | 2 | -2/+41 | |
|/ | | | | | | | | scene, remove the old uuid reference from m_parts as well as adding the new one. The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene) Added unit test for this behaviour. Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error. | |||||
* | Fixed a regression in SOG.Copy() | John Hurliman | 2010-09-16 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-16 | 3 | -1/+38 | |
|\ | ||||||
| * | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -22/+21 | |
| | | ||||||
| * | Removing debug | root | 2010-09-16 | 1 | -1/+0 | |
| | | ||||||
| * | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 | |
| | |