Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 2 | -8/+52 |
|\ | |||||
| * | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 |
| | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | 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 | ||||
* | | COmmented the wrong line instead, now I commented them all to be on the safe ↵ | Melanie | 2010-10-19 | 1 | -2/+2 |
| | | | | | | | | side | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Comment a spammy debug message in the serializer | Melanie | 2010-10-19 | 1 | -1/+1 |
| | | |||||
* | | Fix merge issues | Melanie | 2010-10-18 | 1 | -12/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 2 | -112/+86 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 4 | -123/+157 |
|\ \ | |/ | |||||
| * | 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>. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 2 | -309/+178 |
|\ \ | |/ | |||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-13 | 2 | -7/+1381 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | change default next owner persm to mod/trans to match SL. | Melanie | 2010-10-13 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-10 | 1 | -14/+14 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Add group invites to the list of messages that get offlined | Melanie | 2010-10-10 | 1 | -14/+14 |
| | | | |||||
* | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 1 | -3/+5 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | 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 |
| | | |||||
* | | Fix a security relevant issue with take / take copy | Melanie | 2010-10-09 | 1 | -48/+62 |
| | | |||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 5 | -22/+29 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Implement taking of coalesced objects. | Melanie | 2010-10-07 | 3 | -7/+13 |
| | | | | | | | | | | | | | | WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not. | ||||
* | | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 4 | -40/+18 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 1 | -1/+1 |
| | | | | | | | | functional | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 4 | -4/+6 |
|\ \ | |/ | |||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | 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 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Enforce region agent limit as set in estate tools | Melanie | 2010-09-30 | 2 | -0/+13 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -2/+2 |
| | |