OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,682 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

12682 Commits (f8ccfaf0462a5643d12ad01aadf3787394f69817)

Author SHA1 Message Date
Huaiyu (Kitty) Liu f8ccfaf046 Fixed a few conflicts with Dan's code (earlier conflict resolution by Dan broke 
remote script engine's execution) to make remote script engine execute as it did in
    the implementation in Country Fair 2010 demo.
 2010-11-12 15:50:21 -08:00
Huaiyu (Kitty) Liu bca02499dc Fixed some code in Initialise() in both RegionSyncClientModule and ScriptEngineToSceneConnectorModule, so that OpenSim will not crach if [RegionSyncModule] is not specified or under it, "Enabled" is set. 2010-11-04 15:22:11 -07:00
Robert Adams 49d7ff0307 Avatars no longer snap to middle of target sim when border crossing in a CM 2010-10-26 16:57:47 -07:00
Robert Adams 46a01d9550 Animations to multiple CMs (including idle anims) are working 2010-10-26 12:22:09 -07:00
Robert Adams 9f515cb623 Partial passing of StartAnim and StopAnim through CM 2010-10-25 15:52:41 -07:00
Robert Adams 838ffc27ed Create full updates for making sit complete 2010-10-25 13:32:53 -07:00
Robert Adams 5eca61585d SendAnimations from SIM->CM->client 2010-10-19 15:47:06 -07:00
Robert Adams 3b9a6a565f touch and world chat working 2010-10-19 14:06:59 -07:00
Robert Adams 62fbd2ef08 Undo SetAppearance supression. Debug statements 2010-10-15 14:54:01 -07:00
Robert Adams cf5aeb9a68 Merge branch 'sceneapi' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into sceneapi 2010-10-14 14:35:14 -07:00
Robert Adams de9427e545 Border crossing in multi-region CMs and many debug messages for appearance 2010-10-14 14:31:28 -07:00
hliu19 a9608ba49a Fixed an unwanted warning that a point in space is not covered by any script engine, 
when there is no remote script engine running but that the main Scene is running a
    script engine locally.

    Fixed BroadcastToCM in RegionSyncServer.cs.
 2010-10-05 11:27:36 -07:00
Dan Lake 32b9a8d78d Added missing files to git 2010-09-27 16:00:29 -07:00
Dan Lake f5d25981ac Merged with Kitty's Script engine code. 2010-09-23 16:32:38 -07:00
Dan Lake 1c93854b47 Some little changes to clean up refresh to 0719 2010-09-23 11:51:34 -07:00
Dan Lake 188a2db02a Added a couple of files for client manager support 2010-08-16 10:54:17 -07:00
Dan Lake 8f8ef75034 Merged with main AND partial implementation of teleport based load balancing. Did not intend to combine the merge with these changes. 2010-08-16 10:23:50 -07:00
Dan Lake ae4964050b Merge branch 'master' of git://opensimulator.org/git/opensim 2010-07-19 13:05:36 -07:00
Dan Lake 9ada2a1f34 Client manager changes as of R@I 2010-07-19 13:03:04 -07:00
Diva Canto cd2bb7daf3 Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed. 2010-07-19 08:07:37 -07:00
Melanie a974704a3e re-add the sleep lost in the revert. 2010-07-19 14:37:27 +01:00
Melanie 575f7d3366 Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage" 
This reverts commit c404c5fb54.
 2010-07-19 14:36:53 +01:00
Melanie fa45d5b5fa Revert "A stab in the dark. Revert the compile lockout temporarily. If you know what" 
This reverts commit f798679b80.
 2010-07-19 01:10:57 +01:00
Melanie f798679b80 A stab in the dark. Revert the compile lockout temporarily. If you know what 
this is, you should test it. If you don't, don't use it.
 2010-07-19 00:06:23 +01:00
Melanie 7b62c25cfb Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-07-17 16:25:56 +01:00
Melanie Thielker e157dd630e Allow communicating with blue box dialogs across a region border via a 
child agent
 2010-07-17 16:25:30 +01:00
Justin Clark-Casey (justincc) 9cfa71d1bf Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in llParticleSystem() 
This is a patch from http://opensimulator.org/mantis/view.php?id=3201
Thanks Micheil Martin!
 2010-07-17 00:35:51 +01:00
Justin Clark-Casey (justincc) e05f01e70f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-17 00:27:52 +01:00
Justin Clark-Casey (justincc) f5bdf0d9b9 Fix bugs in llRot2Euler() 
Applies patch in http://opensimulator.org/mantis/view.php?id=4482.
Thanks Micheil Merlin!
 2010-07-17 00:26:26 +01:00
Diva Canto b75fc97865 Fixes mantis #4872. Port for GridInfo was wrong in Robust.HG.ini.example 2010-07-15 03:34:03 -07:00
Justin Clark-Casey (justincc) 99a6950b30 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 23:29:04 +01:00
Melanie 466254105c Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-07-14 23:04:25 +01:00
Melanie Thielker 264f4f07cd Detach attachments displaced by other attachments 2010-07-14 23:04:05 +01:00
Diva Canto 0d8c0811d3 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 14:48:14 -07:00
Diva Canto 6afa55d446 Removed a few obsolete mono addin references. Mantis #4854 2010-07-14 14:47:01 -07:00
Justin Clark-Casey (justincc) 8c10cb5ffe improve closing of load/save iar streams in the event of a problem 2010-07-14 20:43:35 +01:00
Melanie e1ea82b329 Major attachments cleanup. Remove unused AttachObject ClientView method 
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
 2010-07-14 19:51:12 +01:00
Melanie Thielker a7b5fe6a88 Remove useless quaternion parameter from AttachObject sig 2010-07-14 19:49:54 +01:00
Diva Canto b8aa81635f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 11:04:57 -07:00
Diva Canto 12858122d5 Fixes mantis #4870. 2010-07-14 11:02:41 -07:00
Justin Clark-Casey (justincc) 5b03e05035 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 17:55:06 +01:00
Justin Clark-Casey (justincc) 5d83b3f991 comment out obsolete assert that 'item has been passed to another user since it was last set' perms flag was set when a prim item was added to a scene object 2010-07-14 17:53:43 +01:00
Justin Clark-Casey (justincc) 0080c3b1f4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 17:13:04 +01:00
Justin Clark-Casey (justincc) 71433075a9 Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars 2010-07-14 17:12:12 +01:00
Melanie 2291daa95a Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-07-14 16:13:21 +01:00
Diva Canto e17591f4cf Cleaned up a couple of things from OpenSim.ini.example: [Friends] section has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete. 2010-07-14 08:52:22 -07:00
Melanie Thielker 39cd57598b Fix a permissions issue 2010-07-14 16:12:44 +01:00
Melanie 33aa7ba7dc Revert "More on mantis #4869. This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing." 
Cuauses a permission escalation. do NOT USE the preceding commit
 2010-07-14 14:59:34 +01:00
Diva Canto bec1d7cc36 Removed left-over debug messages. 2010-07-14 07:00:24 -07:00
Diva Canto 87fb19162e More on mantis #4869. This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing. 2010-07-14 06:57:56 -07:00