Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Comment repeated add and remove of avatars from the physical scene. It's no | Melanie | 2010-10-25 | 1 | -16/+22 |
| | | | | longer needed. | ||||
* | Change the results from llGetPrimitiveParams to be the same as SL for | Melanie | 2010-10-24 | 1 | -1/+1 |
| | | | | | the prim position. This will make attached resizer scripts work like SL. Existing resizers may be affected adversely. | ||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 2 | -2/+35 |
|\ | |||||
| * | 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 |
| |/ | |||||
* | | 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! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 2 | -9/+3 |
|\ \ | |||||
| * | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 |
| | | | |||||
* | | | 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 |
| | |