aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-274-14/+35
|\
| * Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| |
| * Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-262-4/+4
| |\
| | * Formatting cleanup.Jeff Ames2010-10-272-4/+4
| | |
| * | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵dahlia2010-10-261-9/+27
| |/ | | | | | | specific applications
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-251-16/+22
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
| | | | | | | | | | | | longer needed.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-251-3/+16
|\ \ \ | |/ / |/| / | |/
| * Added inner exception handling in Shape deserialization processing, so that ↵Diva Canto2010-10-231-3/+16
| | | | | | | | the whole Shape processing returns a valid Shape object.
* | Change the results from llGetPrimitiveParams to be the same as SL forMelanie2010-10-241-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-refactorMelanie2010-10-232-2/+35
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\
| | * Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-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-222-7/+2
| |/ | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-222-2/+7
| |\
| | * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-2/+5
| | |
| | * * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | |
| * | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-0/+35
| | |
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-222-9/+3
| |/
* | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps!
* | 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
generated by cgit v1.1 at 2024-12-20 20:35:07 +0000