ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 17:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,500 Commits 5 Branches 96 Tags
ac370cf57b8807db89747e7c40d3727de34274cf
Commit Graph

1570 Commits

Author SHA1 Message Date
Melanie
ac370cf57b Merge branch 'master' into careminster-presence-refactor 2010-10-25 01:24:30 +01:00
Melanie
5f266fd571 Change the results from llGetPrimitiveParams to be the same as SL for 
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
 2010-10-24 17:18:21 +02:00
Diva Canto
627d1a42fe Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object. 2010-10-23 20:39:41 -07:00
Melanie
7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)
80f90229e5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-22 23:56:58 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Jonathan Freedman
38e76d71ac Merge branch 'hg16' into mantis5110 2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc)
e06acae965 Allow region modules to know which agents actually receive chat 2010-10-22 18:33:19 -04:00
Melanie
004b395d12 Make SImStatsReporter pick ObjectCapacity striaght out of region info 2010-10-22 18:27:49 -04:00
Melanie
700f4ddea4 Change some exception to use ToString(). e.Message is not sufficient to fix 
errors. Please don't use e.Message, devs NEED to see the dumps!
 2010-10-22 22:55:07 +01:00
Melanie
301a926015 Change some exception to use ToString(). e.Message is not sufficient to fix 
errors. Please don't use e.Message, devs NEED to see the dumps!
 2010-10-22 13:29:59 +01:00
Jonathan Freedman
d4144bedb8 * change the data exchanged within hypergrid transactions 2010-10-21 23:22:15 -04:00
Melanie
28c4dd7931 Merge branch 'master' into careminster-presence-refactor 2010-10-21 20:26:29 +01:00
Melanie
bb78f1c05a Make SImStatsReporter pick ObjectCapacity striaght out of region info 2010-10-21 15:36:32 +01:00
Melanie
fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman
017b83d0a3 * remove some spurious debug info 
* 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>
 2010-10-20 22:36:29 -04:00
Jonathan Freedman
94684a2251 * remove some spurious debug info 2010-10-20 02:36:59 -04:00
Diva Canto
8731c2be11 It looks like Vector3s also got written down in lower case at some point in 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.
 2010-10-19 15:16:29 -07:00
Diva Canto
8acac3d07f Another take related to the previous commit. 2010-10-19 15:07:15 -07:00
Diva Canto
3b2d9a9939 Added code to quaternion deserialization to try to cope with an exception 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.
 2010-10-19 14:37:03 -07:00
Diva Canto
684449f783 Added TextureAnimation and ParticleSystem to serialization. 2010-10-19 00:04:02 -07:00
Melanie
43a4b7b735 COmmented the wrong line instead, now I commented them all to be on the safe side 2010-10-19 01:23:25 +01:00
Melanie
8853c21763 COmmented the wrong line instead, now I commented them all to be on the safe side 2010-10-19 01:22:31 +01:00
Melanie
e0a02d6ca3 Merge branch 'master' into careminster-presence-refactor 2010-10-19 00:52:35 +01:00
Melanie
5b29b975ee Comment a spammy debug message in the serializer 2010-10-19 00:51:04 +01:00
Melanie
78a6e5489b Fix merge issues 2010-10-18 20:50:16 +02:00
Melanie
bb7a755cba Merge branch 'master' into careminster-presence-refactor 2010-10-18 20:30:46 +01:00
Diva Canto
7038f2b406 Deleted all [XmlIgnore] from SOP, since those are meaningless now. 2010-10-17 10:41:38 -07:00
Diva Canto
22eff055d4 .NET automagical serialization of SOPs replaced by manual serialization across the board. 2010-10-17 10:35:38 -07:00
Melanie
46e5c8e919 Merge branch 'master' into careminster-presence-refactor 2010-10-16 10:52:56 +01:00
Melanie
455a2ba7de Merge branch 'master' into careminster-presence-refactor 2010-10-16 02:27:51 +01:00
Diva Canto
1499607215 Made OARs use the new serialization procedure. (TPs/crossings still on the 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>. 2010-10-15 17:27:19 -07:00
Diva Canto
41ce392d9b Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing. 2010-10-14 09:05:46 -07:00
Diva Canto
45e0cdfcad Added SOP.MediaUrl and Shape.Media to the deserialization 2010-10-13 15:44:25 -07:00
Melanie
bb1e35fbd9 Merge branch 'master' into careminster-presence-refactor 2010-10-13 18:44:58 +01:00
Diva Canto
d890390ecf Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements. 2010-10-13 10:38:34 -07:00
Diva Canto
54a3b8e079 New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet. 2010-10-13 08:16:41 -07:00
Melanie
3eb68c319e change default next owner persm to mod/trans to match SL. 2010-10-13 08:24:18 +02:00
Melanie
0806d03780 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-10-10 22:08:54 +01:00
Melanie
f2febb89fc Change the part for sound playback to be the root part / object UUID instead 
of the child prim because using the child prim plain doesn't work.
 2010-10-10 22:07:36 +01:00
Melanie
2804c97a39 Change the part for sound playback to be the root part / object UUID instead 
of the child prim because using the child prim plain doesn't work.
 2010-10-10 22:06:47 +01:00
Melanie
c2971a6398 Add group invites to the list of messages that get offlined 2010-10-10 20:15:02 +02:00
Melanie
231feab57f Merge branch 'master' into careminster-presence-refactor 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
 2010-10-09 01:07:41 +01:00
Melanie
ff49a21eca Fix a security relevant issue with take / take copy 2010-10-09 01:02:57 +02:00
Melanie
4a0911bdbd Guard against locking a nullref to avoid build break 2010-10-08 19:19:07 +01:00
Melanie
5dcbbb726a Change the order of actions to address a possible nullref 2010-10-08 18:40:13 +01:00
Melanie
52dd547863 Make SendKillObject send multiple localIDs in one packet. This avoids the 
halting visual behavior of large group deletes and eliminates the packet flood
 2010-10-08 11:31:52 +02:00
Melanie
9a5d0984a5 Fix autoreturn to not return zero objects 2010-10-07 02:16:36 +01:00
Melanie
2db0ac74c7 Implement taking of coalesced objects. 
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.
 2010-10-07 01:13:17 +02:00
Melanie
abfede7819 Plumb the path for multiple object deletes 2010-10-06 20:00:51 +01:00