f73c90c633
Put the 'new' back to avoid a warning. Yes, we want to hide it.
2011-01-17 17:52:03 -08:00
a07375a7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 17:41:06 -08:00
c98d1cffe2
Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
2011-01-17 17:40:48 -08:00
2126d12ab8
Merge branch 'master' into careminster-presence-refactor
2011-01-18 01:26:53 +00:00
75644e0f6e
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 01:26:42 +00:00
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
2463f5451c
Merge branch 'master' into careminster-presence-refactor
2011-01-18 01:26:03 +00:00
624bf23abb
force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet
2011-01-17 16:39:53 -08:00
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +00:00
c544f0d0c5
Prune some of the excess logging for client logins.
...
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
523628dca3
minor: remove mono compiler warnings
2011-01-18 00:14:58 +00:00
8233ef25ba
Reduce amount of debug lopgging put out by some simiangrid connectors. Please re-enable if needed.
2011-01-18 00:10:34 +00:00
6e58996b4d
refactor: remove redundant null checks
2011-01-17 23:57:50 +00:00
4f8ba53f86
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 00:55:08 +01:00
81552099d6
Fix UnackedBytes client stack statistic as seen in "show queues"
...
Bytes were being wrongly added again on a resend
2011-01-17 23:45:25 +00:00
37837850d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 13:12:46 -08:00
aecaadd3bd
objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations
2011-01-17 13:10:09 -08:00
4bcee1dfb4
Revert "DEBUG DEBUG DEBUG"
...
This reverts commit 59c2cd04ba
2011-01-17 13:07:02 -08:00
59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
ddb4de139c
Change gesture activation to not quash any other flags
2011-01-17 21:22:32 +01:00
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
479d72ac97
Account for some component along the way lower-casing the HTTP header keys. (XFF header issue)
2011-01-17 11:37:39 -08:00
0aeb8981b2
Brute force debug for XFF issue
2011-01-17 11:19:20 -08:00
66f99ae267
More debug messages to help track the XFF header problem.
2011-01-17 11:03:46 -08:00
76f39d326e
Add a new ViewObjectInventory permission to decouple viewing from
...
+MOD status
2011-01-14 18:26:41 +01:00
8074c6ace1
Revert "Replace the new, tricky MySql.Data.dll with the older version from 0.6.9"
...
This reverts commit e5ce59ff34
2011-01-14 14:54:28 +01:00
d60ddfdfcb
Revert "Remove old guids from the examples, for completeness' sake"
...
This reverts commit 52222d82d5
2011-01-14 14:54:14 +01:00
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
a30bbcbb64
Temporarily reinstate prim counting in the update loop to make the production
...
systems run
2011-01-14 04:09:02 +01:00
fe2d9be0cf
Implement nonlocal god kicks and freezes
2011-01-14 03:35:45 +01:00
139e84c0b2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 01:01:02 +01:00
ddb5f4e44a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:01:50 +00:00
3fc5b6a8ec
Merge branch 'master' into careminster-presence-refactor
2011-01-13 19:53:44 +00:00
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
4eefdd5549
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:21:53 +01:00
b341bc0908
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 11:39:50 -05:00
69666be28c
Implement kicking, freezing and unfreezing users in the same sim via
...
profile god buttons.
2011-01-13 16:05:17 +01:00
c0134710f7
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 04:48:32 +00:00
d92069fb8b
Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.
2011-01-13 04:44:04 +00:00
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
6a2b947e8c
Merge branch 'master' into careminster-presence-refactor
2011-01-12 21:47:05 +00:00
705f4e1e4b
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 21:46:49 +00:00
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
f75a3ee762
Use ToString() rather than a cast (more robust)
2011-01-12 21:25:51 +00:00
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00:00
f59b55d930
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 17:40:21 +01:00
7f99a8c900
Fix direct item give permissions
2011-01-12 16:20:38 +01:00
52222d82d5
Remove old guids from the examples, for completeness' sake
2011-01-11 15:07:04 +01:00
05b1b94cd8
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-11 14:41:37 +00:00
Diva Canto