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
Diva Canto
d64c09160c
Removed some more debug messages.
2010-07-14 04:18:13 -07:00
Melanie Thielker
cd8bb316ea
Remove getting the object capacity from the money module. It is now set
...
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00
Melanie
dd14016885
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
Melanie Thielker
bed36901d1
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 20:37:12 +01:00
Justin Clark-Casey (justincc)
86f3f83250
uncomment a load iar code line I accidentally commented in the last commit
...
hooray for automated tests
2010-07-12 23:37:08 +01:00
Justin Clark-Casey (justincc)
3156f4bbeb
comment out a lot of the debug log messages when loading an iar
...
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
Melanie Thielker
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
Melanie
eaea89bbb7
Remove localID from script controls data. It won't transfer to another
...
region anyway
2010-07-11 13:09:11 +01:00
Melanie Thielker
1169bfeaf3
Make taken items go back to the folder they came from
2010-07-10 10:43:34 +01:00
unknown
6352fc5f57
Bug in 0.6.9 sometimes restoring script state causes region console to crash due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically.
2010-07-09 18:23:48 +01:00
Diva Canto
fe60b6783d
Hopefully fixes mantis #4852
2010-07-08 16:21:01 -07:00
Diva Canto
d2fea2bb29
These 2 files want to be committed.
2010-07-08 16:05:59 -07:00
dahlia
df9d4cd9b2
llVecNorm() now returns a zero-length vector when one is supplied as input. Addresses Mantis #4752
2010-07-08 10:06:08 -07:00
dahlia
815dd73cf3
fix a potential division by zero
2010-07-08 10:01:23 -07:00
Melanie
baebefeb05
Handle a specific exception without spewing red ink.
2010-07-08 16:30:36 +01:00