aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-9/+3
|\
| * Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-8/+52
|\ \ | |/
| * * remove some spurious debug infoJonathan Freedman2010-10-201-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 Canto2010-10-191-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 Canto2010-10-191-13/+17
| |
| * Added code to quaternion deserialization to try to cope with an exception ↵Diva Canto2010-10-191-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 Canto2010-10-191-0/+27
| |
| * COmmented the wrong line instead, now I commented them all to be on the safe ↵Melanie2010-10-191-2/+2
| | | | | | | | side
* | COmmented the wrong line instead, now I commented them all to be on the safe ↵Melanie2010-10-191-2/+2
| | | | | | | | side
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-191-1/+1
|\ \ | |/
| * Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
| |
* | Fix merge issuesMelanie2010-10-181-12/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-182-112/+86
|\ \ | |/
| * Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-172-58/+58
| |
| * .NET automagical serialization of SOPs replaced by manual serialization ↵Diva Canto2010-10-172-59/+21
| | | | | | | | across the board.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-164-123/+157
|\ \ | |/
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto2010-10-154-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-refactorMelanie2010-10-162-309/+178
|\ \ | |/
| * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| | | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
| * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-132-7/+1381
|\ \ | |/
| * Comment a debug message so that it doesn't spew the console upon ↵Diva Canto2010-10-131-1/+1
| | | | | | | | encountering unknown xml elements.
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵Diva Canto2010-10-132-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 insteadMelanie2010-10-101-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.Melanie2010-10-131-1/+4
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-101-14/+14
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Add group invites to the list of messages that get offlinedMelanie2010-10-101-14/+14
| | |
* | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
|/ / | | | | | | of the child prim because using the child prim plain doesn't work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-091-3/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * Guard against locking a nullref to avoid build breakMelanie2010-10-081-0/+3
| |
| * Change the order of actions to address a possible nullrefMelanie2010-10-081-3/+2
| |
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| |
| * Plumb the path for multiple object deletesMelanie2010-10-064-40/+18
| |
* | Fix a security relevant issue with take / take copyMelanie2010-10-091-48/+62
| |
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-085-22/+29
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Implement taking of coalesced objects.Melanie2010-10-073-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 deletesMelanie2010-10-064-40/+18
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-1/+1
|\ \ | |/
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-061-1/+1
| | | | | | | | functional
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-064-4/+6
|\ \ | |/
| * Add the view generating method to the image generator interfaceMelanie2010-10-051-0/+2
| |
| * Formatting cleanup.Jeff Ames2010-10-043-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-2/+1
|\ \ | |/
| * I really have to say it again and again: e.Message is NOT enough data forMelanie2010-10-031-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-refactorMelanie2010-10-031-2/+2
|\ \ | |/
| * Initial port of the Warp3D map tile rendererMelanie2010-10-031-2/+2
| |
| * Reapplying the parts of the prior revert that were not derived from theMelanie2010-10-021-2/+2
| | | | | | | | original patch
| * Revert "Forward-port 0.6 fix"Melanie2010-10-021-2/+2
| | | | | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1.
* | Enforce region agent limit as set in estate toolsMelanie2010-09-302-0/+13
| |