cd9506e842
Don't know HOW we missed this, llSetPos was broken in child prims (and in the llSetPrimitveParams family), it was using the global coordinate as a start location. This resolves mantis #204
2010-08-03 22:41:02 -07:00
6076eb5558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 19:55:57 -07:00
f1c51c8bb4
Scripted sit target fixes
2010-08-03 19:51:32 -07:00
09ab32c21e
Remove StandAlone from default hardcoded config
2010-08-04 03:10:10 +01:00
bda83715e4
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:46:30 +01:00
b38d69287a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 03:24:06 +02:00
0020dbee23
Remove StandAlone from default hardcoded config
2010-08-04 03:23:19 +02:00
5ff9db7388
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:51:41 +02:00
d57bfec702
A god is a god is a god is a god. Right? Right. You're a god from 200, let's
...
show it!
2010-08-04 02:16:46 +02:00
e3cea888fb
Fix some more issues causing regions with corrupt sculpts to freeze.
2010-08-03 16:07:18 -07:00
ae99c1393d
Fix scripted sit offset in child prims
2010-08-03 15:31:04 -07:00
1d1da5069c
Catch a meshing exception caused by corrupt or missing sculpt maps, and mark the prim as "mesh failed" so it doesn't try meshing continuously
2010-08-03 14:11:11 -07:00
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
...
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
2010-08-03 17:09:20 +01:00
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
...
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
...
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
2010-08-03 15:45:49 +01:00
e3184753a6
Log the UUID of a prim that fails meshing and set the prim to phantom during
...
region startup
2010-08-03 05:25:23 +02:00
d2d1c63b17
Revert "Catch meshing error in Meshmerizer"
...
This reverts commit 8f2986bc6a
2010-08-03 05:25:01 +02:00
ecfea5fa69
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-02 21:56:30 -07:00
8f2986bc6a
Catch meshing error in Meshmerizer
2010-08-02 21:54:47 -07:00
8e37e7eb07
Remove the (wrong) implementation if llPointAt. It never worked on the LL
...
grid and is officially deprecated. There is no way to rotate an avatar
programmatically.
2010-08-02 00:41:40 +01:00
16e90809a9
Remove the (wrong) implementation if llPointAt. It never worked on the LL
...
grid and is officially deprecated. There is no way to rotate an avatar
programmatically.
2010-08-02 00:54:58 +02:00
d2d56494b2
Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default)
2010-08-01 10:24:43 -07:00
763dc8bb76
Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrpc_uri event if it's not mentioned in the ini.
2010-08-01 10:24:17 -07:00
b860c8021e
First, change DefaultPermissionsModule so it returns the correct name...
...
... Then, make sure we also check the old-style module stack before we throw a tantrum
2010-08-01 10:23:48 -07:00
d5f497478a
Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load.
2010-08-01 10:21:56 -07:00
dd2d9a68a7
Merge branch 'master' into careminster-presence-refactor
2010-07-31 01:05:13 +01:00
168a8e9ae5
Thank you, Snoopy, for a patch to fix child prim movement. This still doesn't
...
address limiting link distance, but at least it makes the UI and LSL
match.
2010-07-31 01:03:14 +01:00
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
f3fa10fa15
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-07-30 14:04:29 -07:00
8ab7d80b09
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
2010-07-30 14:04:13 -07:00
f84dbafb0c
remove gods event subscription to gods module from scene
2010-07-30 21:58:24 +01:00
63f3a16b72
remove empty, unused and uncalled UnsubscribeToClientEvents()
2010-07-30 21:44:50 +01:00
424b4b2b86
move attachment subscription events into AttachmentsModule from scene.
...
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
2010-07-30 21:41:44 +01:00
4d83b2d8a6
remove unused BasicQuadTreeNode
2010-07-30 21:06:45 +01:00
f37ec933ae
store terrain module trying to load plugins if plugin path does not exist
2010-07-30 20:54:02 +01:00
c6bc1d28ec
move ChannelDigger from its own project into the main terrain module with the rest of the effects
2010-07-30 20:34:14 +01:00
315b065bce
Remove unused LLFileTransfer
2010-07-30 19:58:29 +01:00
5b80e3fc18
convert attachments module from old region module style to new
2010-07-30 19:26:54 +01:00
f9280374d2
Bannination fixes. Objects in nonpublic parcels were muted by default. Gods
...
were muted, too.
2010-07-30 15:03:03 +02:00
2257e39eda
Make dataserver() return a 0 when agent id offline, instead of a timeout
2010-07-29 23:20:38 +01:00
696b6c727f
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:20:40 +01:00
7871dd606e
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:33:20 +02:00
f067f733ea
add userExposed parameter to part copy event
2010-07-28 19:38:20 +01:00
0f15ccb2cf
relocate moap specific cloning code to MoapModule
2010-07-28 19:23:30 +01:00
5aa56b1274
Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart
...
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
2010-07-28 18:55:29 +01:00
b149d8970e
comment out verbose debug logging
2010-07-27 22:49:45 +01:00
30ac67fb3d
make MoapModule ignore possible future media texture data that it can't handle
2010-07-27 20:15:43 +01:00
ac542a907b
Make MoapModule ignore non-sl media texture data
2010-07-27 18:59:05 +01:00
4d23749241
provide config option for media on a prim
2010-07-26 23:34:23 +01:00
412fed975f
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
b51b2efdc8
Add EventManager.OnSceneObjectPreSave() for future use. This is triggered immediately before a copy of the group is persisted to storage
2010-07-26 23:34:22 +01:00
586ae0f6a0
Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage.
2010-07-26 23:34:22 +01:00
d764c95d09
also add avatar id to an updated media url - not just new ones
2010-07-26 23:34:22 +01:00
b06308e1d3
Properly set TextureEntry.MediaFlags when a media texture is set
...
Media flags is cleared via a direct TextureEntry update from the client. If the clearing leaves no media textures on the prim, then a CAP ObjectMediaUpdate is not received. If there are still media textures present then one is received.
This change fixes drag-and-drop on Windows (and Mac?) clients. It may also fix problems with clearing and then subsequently setting new media textures.
2010-07-26 23:34:22 +01:00
60c52ac0c4
start adding user ids to the media urls
2010-07-26 23:34:22 +01:00
cd985ab71b
Handle checking of line starting "*" wildcard for whitelist patterns
...
A line starting * can only be applied to the domain, not the path
2010-07-26 23:34:21 +01:00
664cbe2357
refactor: simplify current whitelist url checking by using System.Uri
2010-07-26 23:34:21 +01:00
0edabffb7d
Implement * end wildcard for whitelist urls
2010-07-26 23:34:21 +01:00
dce7307aa2
properly expose prim media LSL functions to scripts
...
scripts using these functions should now compile but I don't know how well the methods themselves work yet
llSetPrimMedia(), at least, appears to have problems when a current url is set for a face that doesn't yet have a texture
2010-07-26 23:34:21 +01:00
049ccba8d3
fix previous media interact serverside checking. perform very basic serverside url whitelist checks
...
at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work
2010-07-26 23:34:21 +01:00
cf7573c8fd
implement code to deregister users on DeregisterCaps
2010-07-26 23:34:21 +01:00
ee6cd884c9
implement serverside checks for media texture navigation in order to stop naughty clients
2010-07-26 23:34:21 +01:00
a9101feb10
factor out soon to be common media permissions check code
2010-07-26 23:34:20 +01:00
51b208e96c
implement prim media control permissions serverside in order to stop bad clients
2010-07-26 23:34:20 +01:00
e5615d3a9b
discard an object media update message if it tries to set more media textures than the prim has faces
2010-07-26 23:34:20 +01:00
eb5e39d6ef
Fire CHANGED_MEDIA event if a media texture is set or cleared
2010-07-26 23:34:20 +01:00
39a38c4901
implement llClearPrimMedia()
...
untested
2010-07-26 23:34:20 +01:00
d1a879927c
fix issue with GetMediaEntry if the face requested wasn't set to a media texture
2010-07-26 23:34:20 +01:00
43f480864b
fix problem persisting when only one face had a media texture
2010-07-26 23:34:20 +01:00
c76e2ce250
factor out common code for updating the media url
2010-07-26 23:34:19 +01:00
74bc4f61fd
factor out common face parameter checking code
2010-07-26 23:34:19 +01:00
cfb79cd411
minor: correct a few method names and change accessability
2010-07-26 23:34:19 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
8f403cb4b8
Implement llGetPrimMediaParams()
...
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-26 23:34:19 +01:00
9682e0c733
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
4ebae14a53
handle ObjectMediaNavigateMessage
...
Other avatars can now see the webpages that you're navigating to.
The requirement for an initial prim click before the texture displayed has gone away.
Flash (e.g. YouTube) appears to work fine.
Still not persisting any media data so this all disappears on server restart
2010-07-26 23:34:18 +01:00
468450a94d
send a full object update out to avatars when a media texture is initially set
...
this allows other avatars to see it, but still only after they've clicked on the face
still not handling navigation yet
2010-07-26 23:34:18 +01:00
b1eb83ed6c
start sending media url in object full updates
2010-07-26 23:34:18 +01:00
4a6adff4cd
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-26 23:34:18 +01:00
c290cdd997
replace hand parsing of incoming object media messages with parsing code in libopenmetaverse
2010-07-26 23:34:18 +01:00
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
9301e36fbc
have a stab at sending the correct number of media entries to shapes
...
actually, this is probably wrong anyway if there's a default texture
it's going to be easier just to gather the object media updates and retain those in-memory now
but what the hell
2010-07-26 23:34:17 +01:00
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
2be7d0cdd4
Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.
...
Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out).
This is not yet persisted even in-memory, so no other avatars will see it yet.
2010-07-26 23:34:17 +01:00
ede446cad6
add stub media-on-a-prim (shared media) module
2010-07-26 23:34:17 +01:00
516ec4acd0
Eat a lockign exception that kills scripts. May bear more investigation
...
in the long run.
2010-07-25 08:11:39 +02:00
83aec1ec94
Fix a little infinite recursion i added just for sh.ts and giggles. NOT.
2010-07-22 23:47:10 +02:00
7ebabf185e
change the delay to 0.2s. My bad.
2010-07-22 19:31:02 +02:00
ce8b9b4181
LSL compatibility fix. Add 0.1 s sleep to llSetLinkPrimitiveParams so fade scripts will time correctly. The -Fast version works without a delay
2010-07-22 19:20:09 +02:00
fb89d0ff4e
Allow megaregions to be used in M7, should we so decide
2010-07-21 12:32:23 +02:00
d4022becc3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-21 12:16:30 +02:00
f63a4c8f2f
Merge branch 'master' into careminster-presence-refactor
2010-07-21 12:03:44 +01:00
c72c84b455
Refine autoreturn a bit
2010-07-21 12:16:17 +02:00
ac1a34714d
Allow Megaregions to start properly after an unclean shutdown
2010-07-20 23:24:04 +01:00
f08afc4f87
Restore lines that have been removed due to previous merge conflict.
2010-07-20 14:28:17 -07:00
4ccc141764
Resync with master
2010-07-20 21:49:31 +01:00
c0b8cbd85b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:47:53 +01:00
dcf7973c9b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:39:20 +01:00
176cb01130
Remove a merge artefact
2010-07-20 21:38:31 +01:00
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
120d7014fd
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 21:01:46 +01:00
ea51bea508
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-20 21:01:14 +01:00
78605baab3
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-20 21:00:56 +01:00
e46c0a0fc9
adjust DialogModule to only send broadcast alerts to root agents
2010-07-20 21:32:13 +01:00
7c124a5543
Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress.
2010-07-20 05:59:18 -07:00
fd66ee57f3
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 14:45:46 +02:00
b7f1288361
Adding it again.
...
Revert "Reverting this for now, but this needs to go in again."
This reverts commit c0d9ab941d
2010-07-20 04:23:39 -07:00
c0d9ab941d
Reverting this for now, but this needs to go in again.
...
Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks."
This reverts commit ffbae52a13
2010-07-19 16:22:29 -07:00
191bee2ed0
Remove the null checks altogether
2010-07-20 00:55:31 +02:00
54da64acac
Remove exception badness in the LSL Types. Who ever came up with that.....?!
2010-07-20 00:46:39 +02:00
ffbae52a13
Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks.
2010-07-19 15:20:34 -07:00
5c0c7fda6c
One more stab at http://opensimulator.org/mantis/view.php?id=4858 .
...
Eliminated the nested locks of m_Scripts and m_PrimObjects.
2010-07-19 13:59:11 -07:00
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
a974704a3e
re-add the sleep lost in the revert.
2010-07-19 14:37:27 +01:00
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
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
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
c263fc54ac
Add a state change method to the Async commands handler to allow timers
...
and http requests to survive state changes
2010-07-18 21:05:50 +02:00
c088397ec7
If the client requests that an object be deleted, and the SOG/SOP is null and/or is marked as deleted, just send the KillObject
2010-07-18 06:01:26 -07:00
fabe2206db
Ensure that packets do NOT get delivered to a client before the modules that can deal with the client's response have finished loading.
2010-07-17 15:08:59 -07:00
17412389f3
Revert 233c872.. "* Call client.Start() sunchronously. Calling thos async avoids some stuttering", pending fix for the core issue
2010-07-17 14:34:35 -07:00
7b62c25cfb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-17 16:25:56 +01:00
e157dd630e
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:25:30 +01:00
d52fb4d2e9
Shorten LLEmail delay to 15s. With the external spam protection, we can
...
afford to do that
2010-07-17 16:35:14 +02:00
c41d418380
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:32:55 +02:00
85f454e3ae
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-17 02:26:34 +02:00
9bf6179d24
Fix scripted give of items
2010-07-17 02:26:09 +02:00
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
e05f01e70f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-17 00:27:52 +01:00
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
236c0f8e8b
Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187
2010-07-16 22:17:06 +00:00
2e5f200b3b
Fix showing CreateSelected on all parts of a rez
2010-07-16 20:23:41 +02:00
3f91805afb
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-15 20:28:18 +02:00
8d2b4b7b48
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-15 20:03:08 +02:00
99a6950b30
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 23:29:04 +01:00
466254105c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-14 23:04:25 +01:00
264f4f07cd
Detach attachments displaced by other attachments
2010-07-14 23:04:05 +01:00
8c10cb5ffe
improve closing of load/save iar streams in the event of a problem
2010-07-14 20:43:35 +01:00
ddfff55cc7
Preserve attachment data while a prim is in world. Allows attachment
...
editing on the ground without losing attachpoint and position
2010-07-14 21:06:49 +02:00
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
a7b5fe6a88
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:49:54 +01:00
d665f0ae66
Detach attachments displaced by other attachments
2010-07-14 20:46:26 +02:00
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
12858122d5
Fixes mantis #4870 .
2010-07-14 11:02:41 -07:00
bebbe407ee
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:58:23 +02:00
0c445239a6
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:21:01 +02:00
0080c3b1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:13:04 +01:00
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
39cd57598b
Fix a permissions issue
2010-07-14 16:12:44 +01:00
d1f94b5d58
Merge branch 'master' into careminster-presence-refactor
2010-07-14 16:12:14 +01:00
cbb3a8ab94
Fix a permissions issue
2010-07-14 16:21:55 +02:00
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
bec1d7cc36
Removed left-over debug messages.
2010-07-14 07:00:24 -07:00
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
d64c09160c
Removed some more debug messages.
2010-07-14 04:18:13 -07:00
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
af13c80d68
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:59:26 +02:00
c5891c14c7
Bail out in AttachToBackup if the group is an attachment
2010-07-13 15:32:35 -07:00
7270cd0ade
Second part of the fix for llGetLocalPos; get attachment offset in the root prim of an attachment. This function now behaves in line with SL.
2010-07-13 14:57:50 -07:00
8c2e1c6c29
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-13 21:12:01 +00:00
8c26c8bbc6
adding the 'wearble' case for llGetLocalPos.
...
Still not working cause the offsets are not updated (always <0,0,0>)
2010-07-13 21:10:26 +00:00
84227fd558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-13 20:37:45 +00:00
7ab103c96f
Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only.
2010-07-13 20:37:13 +00:00
eacf3d9221
Merge branch 'master' into careminster-presence-refactor
2010-07-13 20:46:21 +01:00
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
bed36901d1
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 20:37:12 +01:00
89c1c5c35a
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:40:23 +02:00
31cbd6d113
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 18:23:23 +02:00
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
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
5f4105d48c
Removed the CHANGED_COLOR event post from the Color accessor in SOP. This is not the correct usage of this changed event - it's only supposed to be posted when the /textures/ change colour or alpha transparency, not the floating text. This fixes several race conditions in scripts ported from SL.
2010-07-12 13:55:56 -07:00
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
7f0f11304f
Add scripted controllers into agent intersim messaging
2010-07-11 14:26:57 +02:00
922e874653
Merge branch 'master' into careminster-presence-refactor
2010-07-11 13:32:10 +01:00
eaea89bbb7
Remove localID from script controls data. It won't transfer to another
...
region anyway
2010-07-11 13:09:11 +01:00
1169bfeaf3
Make taken items go back to the folder they came from
2010-07-10 10:43:34 +01:00
8aa5f30082
Make taken items go back to the folder they came from
2010-07-10 10:51:49 +02:00
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
d2fea2bb29
These 2 files want to be committed.
2010-07-08 16:05:59 -07:00
05b35eb57c
Correct a merge artefact
2010-07-08 18:17:02 +01:00
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
815dd73cf3
fix a potential division by zero
2010-07-08 10:01:23 -07:00
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
32cfdb0f6a
Switched order of conditionals.
2010-07-07 02:40:51 -07:00
07559707c5
Fixes problem where "Adult" regions were reported as being of type "Unknown".
2010-07-07 02:37:22 -07:00
faaef1b498
minimizes temp garbage for llParseStringKeepNulls()
...
and uses common routine for llParseStringKeepNulls()/llParseString2List()
2010-07-06 23:59:06 +00:00
6e7f1a3ac1
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-07-06 02:23:10 +00:00
90c5555d6d
rewrote hanging llParseStringKeepNulls()
2010-07-06 02:22:47 +00:00
657056a73f
Fixes mantis #4845
2010-07-05 08:48:02 -07:00
debc780654
Fixes additional bug reported in mantis #4841 .
2010-07-05 07:14:32 -07:00
e947d04038
Undo fix is now complete. This commit repairs the special case of the root prim moving or rotating independently of the rest of the group.
2010-07-05 05:44:35 -07:00
be5dd04150
Bring "Redo" up to date with "Undo" so it works too
2010-07-05 03:58:18 -07:00
c7e4880a5e
One more buglet fixed related to mantis #4841 -- auto-returns were still chocking on a null pointer exception.
2010-07-05 03:36:26 -07:00
8849b9af8b
Fix single prim rotation undo. All UNDO functions are now working correctly except for when the root prim is moved or rotated as a single prim (coming soon).
2010-07-04 20:45:11 -07:00
c616335019
Rotation undo fix and remove a debug chatter i missed. Still not working: Individual child prim rotational undo and special cases where the root prim was moved or rotated (all the children then need to restore their offsets). Coming shortly.
2010-07-04 19:58:52 -07:00
5b68343361
The majority of the Undo fix. There is still an issue with Rotation which i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.
2010-07-04 19:28:39 -07:00
b84f72df0b
Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids.
2010-07-04 14:59:15 -07:00
02a15bc787
Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory.
2010-07-04 13:56:03 -07:00
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
abe0a9ff49
Fixes the obvious problem in mantis #4841 . Melanie needs to look at other potential problems there, though.
2010-07-04 02:59:38 -07:00
baa20a10c3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 20:29:06 +02:00
edcfaf60c9
Fix IMs the right way. This sets it up so that timestamps are actually
...
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
2010-07-03 20:27:00 +02:00
4cd5e64231
Use SendTransferAbort in a more sensible place
2010-07-03 09:22:58 -07:00
e4739523d3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 06:11:46 -07:00
fe2b044d38
Fix Undo! Made a lot of changes to Undo state saving; it now considers that groups of objects can be moved and not just individual prims..
2010-07-03 06:10:55 -07:00
86a82e6ecb
Now, fix the slash issue the right way. Our URLs now work like SL's
2010-07-03 08:33:08 +02:00
721d8a7298
Re-add the slashes at the end of the URL. Too much depends on them
2010-07-03 07:09:27 +02:00
79c1eb1e39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-02 06:36:08 -07:00
490f1c144c
Fixes mantis #4782
2010-07-02 06:35:38 -07:00
233c872d24
Call client.Start() sunchronously. Calling thos async avoids some stuttering
...
when people log in, but fatally screws up money.
2010-07-02 09:40:58 +02:00
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
c87e6a289c
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:20:36 +02:00
fda9d7b75e
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:45:03 +01:00
9e0b562c6e
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:21:07 +01:00
beb5259cd1
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:51:31 +02:00
a7c4cb95aa
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:26:55 +02:00
848623eea5
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:04:43 +01:00
120c9a4ebb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-02 03:11:18 +02:00
ec73074aac
Merge branch 'master' into careminster-presence-refactor
2010-07-02 03:02:53 +01:00
60c15d7c28
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:05:40 +02:00
54d7f6ef43
Add region name on the end of script startup debug messages
2010-07-01 21:34:53 +01:00
3d5d44279b
ANother stab at LSL compatibility
2010-07-01 17:06:29 +02:00
d5cbe4cb75
Remove trailing slash from HTTP URLs to be compatible with SL
2010-07-01 16:40:26 +02:00
3940a4dbc7
Avoid a spurious error message when taking a friend's no copy item
2010-07-01 16:11:10 +02:00
8326f36cda
minor: comment out high volume texture serving module debug message
2010-06-30 22:07:28 +01:00
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
dd579cf615
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-30 21:26:43 +01:00
1db2921782
Fix scripts in rezzed objects not starting (Mantis #4775 )
2010-06-30 21:25:39 +01:00
5925aac859
Add --merge switch to load iar.
...
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
be0af01061
Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
...
This reverts commit 94cb6fc916
2010-06-29 23:43:38 +01:00
714367efb9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 21:51:56 +01:00
d06b977ed1
Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure.
2010-06-29 14:21:48 -07:00
6701fc2ffa
Fix the XML serializationt to provide an empty script state element if
...
the script hasn't yet saved state, or can't save state because of a loop
2010-06-29 21:50:52 +01:00
5d11833ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 20:36:36 +01:00
94cb6fc916
stop exceptions in setting and getting state from propogating since they aren't fatal to operations
...
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00
5964084d25
Fix a nullref on autoreturn
2010-06-29 20:36:17 +01:00
c607e6f3b8
Revert "don't report the null uuid as a missing asset on saving oars/iars"
...
This reverts commit 5ce119174e
2010-06-29 20:30:22 +01:00
cf15558c9e
This file wants to be committed.
2010-06-29 06:25:12 -07:00
fa3f448324
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-29 04:40:02 -07:00
08e3389790
Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
2010-06-29 04:38:15 -07:00
9fde9085a0
Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule.
2010-06-29 02:07:10 -07:00
3cd717d929
Comment the "Notecard saved" notification that pops up when a notecard
...
is saved into a prim. Sl doesn't have it, and for good reason: It also
happens on scripts in our version. Which is wrong. Better no message
than a wrong one.
2010-06-29 04:09:14 +02:00
6f4d4543b9
Make newly created prims be named "Object" and make newly created scripts
...
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
621195e4f1
Thanks Micheil Merlin for Mantis #4784 : [PATCH] llRotBetween does not return correct rotations for a 180 degree angle between vectors
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-06-28 17:33:47 -07:00
d123350164
One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated.
2010-06-28 16:04:12 -07:00
3e908023b2
Force IM timestamps to current server time to prevent "Saved on" headers
...
while the sender is online
2010-06-28 08:58:51 +02:00
7807d11807
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-27 22:23:08 -07:00
827d9be48f
Fix the sound issue. It was caused by missing assets; once the client has made one request, it continued to wait for asset before requesting any new ones, until the TransferRequest timed out. Fixed by adding a TransferAbortPacket if the asset cannot be retrieved.
2010-06-27 22:23:01 -07:00
0a82d10fc4
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 03:14:05 +01:00
85a9c305a2
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
...
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:43:26 +01:00
4cdda2cae9
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:36:40 +01:00
4fa1d4896c
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 02:30:36 +02:00
a817f6b48c
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
...
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:48:24 +02:00
d570cffa39
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:29:30 +02:00
660a560d3b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 20:59:51 +01:00
3612a5252b
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:23:33 +01:00
2cced72d70
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-27 21:05:06 +02:00
9c553cd254
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:20:08 +01:00
ba38c697e8
Merge branch 'master' into careminster-presence-refactor
2010-06-27 20:05:55 +01:00
205d2496f6
Fix permission propagation to prevent permanently locked objects from being
...
created.
2010-06-27 20:04:39 +01:00
19f18c8a1b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 21:04:30 +02:00
ef0ac7c403
Deal with incoming land objects properly so they don't just stack up
2010-06-26 23:20:28 -07:00
9f00f141fe
Restore "AllowCareminsterFunctions" as an alias to the new "AllowLightshareFunctions".
2010-06-26 18:54:55 -07:00
592ff1288d
Add a new global event : OnTerrainUpdate
2010-06-26 18:51:19 -07:00
c97e9f8621
Reverting the ITerrainModule changes. Turns out this was useless.
2010-06-26 18:43:01 -07:00
3bcee57e3e
add HasChanged to ITerrainModule
2010-06-26 17:34:19 -07:00
c3e806a2ea
Add a new accessor for the TerainModule : "HasChanged"
2010-06-26 17:25:45 -07:00
8f0adfbfb2
Trigger the RegionLightShareData OnSave event properly when the profile is saved
2010-06-26 15:15:19 -07:00
d188ed8ed8
Return everything at once, it's more efficient that way
2010-06-26 13:07:17 -07:00
ed5dac7e82
Fix another nullref issue in DeRezSceneObject
2010-06-26 13:06:47 -07:00
bd19cf739a
Fix a bug with DeRezObjects (check for a null remoteClient)
2010-06-26 12:38:08 -07:00
acab2a159d
Return objects which are NoCopy instead of just leaving them when cleaning the scene, if exceptNoCopy = true.
2010-06-26 11:24:36 -07:00
70d3b9aeca
Add a DeleteAllSceneObjects(bool exceptNoCopy) method to allow NoCopy objects to be retained when the scene is cleared.
2010-06-26 11:14:58 -07:00
06fd49bda9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-26 06:17:09 +02:00
6274317e63
Fix loading of attachments on login
2010-06-26 06:16:24 +02:00
f64d1cb396
Add new event: OnChangedBackup
2010-06-25 14:39:15 -07:00
30397b6fbc
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-25 14:26:07 -07:00
96e649189f
Add two events: OnAttachToBackup and OnDetachFromBackup.
2010-06-25 14:25:39 -07:00
a4a808818f
don't report the null uuid as a missing asset on saving oars/iars
2010-06-25 21:48:19 +01:00
4a5979c311
minor: remove some mono compiler warnings
2010-06-25 21:09:15 +01:00
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
52b711af82
stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent isn't present in the presence dictionary
...
the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
2010-06-25 18:55:20 +01:00
2c4df19805
minor: Move log information about SYSTEMIP to the place where it's resolved
2010-06-25 18:29:02 +01:00
afff74a835
Add DwellModule interface
2010-06-25 01:44:17 +02:00
8a0ec60c8f
Unhook the dwell request from the land module (and therefore local storage)
2010-06-25 01:41:00 +02:00
f186882c0f
Also make prims send the proper position. I hate it when people comment
...
out things just because they're "not yet used". Grrrr.
2010-06-24 20:51:04 +02:00
cbca58401a
Add the object owner UUID into the binary bucket of object to user IM
2010-06-24 20:46:24 +02:00
2cc1f14b0c
Replace the imSessionID, which is useless out of context, with the scope id
...
in saved IMs
2010-06-24 19:37:02 +02:00
b012e963d7
New viewers don't set the "save offline IM" flag anymore. Set it serverside
...
so messages get saved
2010-06-24 18:48:40 +02:00
6c37a02c0f
bug fix. 0,0 is a vlid sim coordinate
2010-06-24 06:02:44 +02:00
5a071dc798
Move loading of parcels to before script start. Scripts using parcel functions
...
can fail if no land is loaded
2010-06-24 03:24:38 +01:00
9d03271265
And another
2010-06-24 03:43:50 +02:00
e94cf3d9b7
And another conflict
2010-06-24 03:35:42 +01:00
e93853623b
Merge branch 'master' into careminster-presence-refactor
2010-06-24 03:30:11 +01:00
c404c5fb54
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
2010-06-23 21:14:28 +01:00
ce6fbd9680
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:40:59 +01:00
7db5262e35
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-22 23:40:12 +01:00
c96a6940a9
Line ending fix
2010-06-22 16:11:36 -07:00
68551675df
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 23:39:39 +01:00
854a8b9172
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 23:39:25 +01:00
317ac50a97
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:38:56 +01:00
5c02fb435d
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 17:35:00 +02:00
962dade155
Cause collisions with the avatar to be sent to attachments. Currently
...
ignores collision filter. Physics collisions are still dodgy, so we
don't get the events we should be getting.
2010-06-22 04:04:59 +02:00
3428196631
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 02:33:20 +02:00
9d251b1dc5
Fix the StandUp position to calculate as if we're still using the child prim id.
2010-06-20 15:57:01 -07:00
fc715a092c
Fix the sit code to ensure that we use the root prim of a linkset as a reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059 .
2010-06-20 15:38:48 -07:00
33d05ef554
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-20 14:45:36 -07:00
a1416612a9
Update all clients sitting on a linkset if a child prim is moved. This prevents avatars being "lost in the void" until they stand up when a child prim is moved that they're sitting on.
2010-06-20 14:45:04 -07:00
13a0b65a80
Modify avatar responsiveness policy to send roots before children
2010-06-20 21:38:06 +02:00
797767da57
Insert a space after the comma on the ToString methos of lsl vectors
...
and rotations to match SL.
2010-06-20 07:16:19 +02:00
95c763201f
Set the offline flag in inventory offers
2010-06-20 06:36:46 +02:00
76b59b8df7
Make dataserver() return a 0 when agent id offline, instead of a timeout
2010-06-20 06:23:08 +02:00
c571c33b6b
fix faulty profile cut parameter checking in llSetPrimitiveParams() - see Mantis #4510
2010-06-19 16:07:35 -07:00
24a68e36fb
Bug fix: wrong name of requester in local friendship offer.
2010-06-19 12:32:36 -07:00
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
49d7d8534c
Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. This unlocks an awful lot of poseball-free content, and is a step towards resolving mantis #59 .
2010-06-19 10:06:09 -07:00
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
9b410f5e94
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777 .
2010-06-19 09:25:36 -07:00
f0f684161e
Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777
2010-06-19 08:57:58 -07:00
6d8da699b2
Add "AvatarHeight/2" to the Home Position when set to avoid having the avatar fall through the ground when they TP home.
2010-06-19 07:00:01 -07:00
891214c65b
Merge branch 'master' into careminster-presence-refactor
2010-06-18 20:49:21 +01:00
71a73d83cb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-18 19:50:01 +01:00
47d5f90629
Remove an error in meshing error reporting. Now doesn't double-bomb
...
anymore on a bad sculpt
2010-06-18 19:49:14 +01:00
71c8bbaf2c
Fix problem where iar load would duplicate huge number of folders
...
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
11a35d8cda
change TestPartExistingIarPath() to check appropriate folder creation
...
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
cf4721a92d
in IAR utils, return all folders that match a particular path rather than just the first one
2010-06-18 16:33:34 +01:00
cea7905602
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 13:04:32 -04:00
958c6c6fde
Add rez on water surface.
2010-06-17 13:04:18 -04:00
d1c8b083b8
Fix llRot2Euler with a mathematically sound implementation. The only difference between this an SL is that SL resolves a figure of negative PI into PI, and does the equivalent in the reverse (llEuler2Rot, -1.0 becomes 1.0);
2010-06-17 04:15:07 -07:00
b9c40320f1
Fix llAttachToAvatar. This addresses mantis 128 .
2010-06-16 09:20:20 -07:00
117fd629d6
Allow llMapDestination to be used in any event if the host is an attachment. This fixes Mantis 0000098.
2010-06-16 08:32:47 -07:00
0b75f759b4
Merge branch 'master' into careminster-presence-refactor
2010-06-16 04:10:55 +01:00
9c9ce9e8dd
* Deleted duplicated migration that was failing anyway.
...
* Added an error message in initial estate owner creation that makes it clear what needs to happen.
2010-06-14 11:50:42 -07:00
ef1496ca2d
Add "alert dialog" for sending dialogs to users from the console
2010-06-14 04:28:38 -07:00
53c32d8773
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
2010-06-14 12:09:35 +01:00
704da8c823
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
2010-06-14 04:03:54 -07:00
bd346ab8c7
Fixes attachments coming back upon being detached in neighbouring regions and crossing.
2010-06-13 19:18:17 -07:00
19558f380a
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
2010-06-13 19:06:22 -07:00
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
9b30f44672
D.U.H. #2 . Inverted test. Again. Argh!
2010-06-14 02:28:31 +02:00
1532dbca0a
Guard against a potential nullref
2010-06-14 00:12:39 +02:00
f9b4f5f594
Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
...
This reverts commit f59e272643
2010-06-14 00:05:01 +02:00
5fda89fdb5
Revert "D.U.H."
...
This reverts commit 3058761806
2010-06-14 00:04:02 +02:00
093cc047cd
Revert "Try it witht he root prim"
...
This reverts commit d520360cb8
2010-06-14 00:03:43 +02:00
62763cc0fb
Report current position instead of position at the time we sat down
2010-06-14 00:02:17 +02:00
d520360cb8
Try it witht he root prim
2010-06-13 23:01:15 +02:00
3058761806
D.U.H.
...
un-reverse a reversed condition
2010-06-13 22:43:14 +02:00
520b0e131c
Try to make prims stop moving. Reset velocity, etc, unconditionally. Although
...
the phys actor may be new, the prim fields could still be set and the
slimupdates system would continue sending that data out.
2010-06-13 22:37:11 +02:00
3d319d6c3f
Actually update the SP. EXPERIMENTAL
2010-06-13 22:23:07 +02:00
f59e272643
Introduce SOP.UpdateSitters() to update sitting avatars' chat position if
...
needed
2010-06-13 22:21:05 +02:00
b3594681a4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 12:09:06 -07:00
66619b5996
Added checks for failed UpdateAgent calls.
2010-06-12 12:08:45 -07:00
5e4bee0f34
Merge branch 'master' into careminster-presence-refactor
2010-06-12 19:15:59 +01:00
59acb37d92
Change name of method to better reflect what it does
2010-06-12 19:14:46 +01:00
b9c01a1c42
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 11:11:48 -07:00
e6efe34b4c
* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
...
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
4950ee5f3b
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 16:27:55 +01:00
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
63531b1df5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 04:36:14 -07:00
3ea11fe2e6
Get rid of spamming SOG debug message
2010-06-12 04:35:51 -07:00
3c036934a3
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:28:00 +01:00
4c58ac2c90
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:35:03 +01:00
65f03af38f
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 07:34:55 +01:00
03a48f87e4
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:29:20 +02:00
e337c9130f
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:34:22 +02:00
57a60282f5
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 06:57:10 +01:00
0ece71f8d1
Merge branch 'master' into careminster-presence-refactor
2010-06-12 06:14:10 +01:00
92fea025cb
Resume scripts that have been rezzed from a prim
2010-06-12 06:13:27 +01:00
99f2a1c347
* Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
2010-06-11 21:46:01 -04:00
ae0a7e2c37
Merge branch 'master' into careminster-presence-refactor
2010-06-12 02:19:57 +01:00
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
c8ed972443
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
...
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
836728e5de
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:08:20 +01:00
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
2010-06-11 22:13:36 +01:00
694c8ab588
Remove the lastmap stuff from the map module, also remove a bunch of comments
...
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
...
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
4e34770aba
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:56:43 +01:00
556e91d33c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-11 12:48:06 -07:00
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
1cfebca48d
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:35:00 +01:00
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01:00
7c4cf46bac
Rename CM files to LS
2010-06-11 17:42:41 +01:00
ad87bab271
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:30:23 +01:00
b64f42fa41
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:03:45 +01:00
be71a2e5bc
Revert "Remove the cm* function namespace"
...
This reverts commit ef93ac4452
2010-06-11 17:52:19 +02:00
b1224c3540
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:47:34 +01:00
aa2f5bdd77
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:46:29 +01:00
ef93ac4452
Remove the cm* function namespace
2010-06-11 17:48:33 +02:00
10ef80cf15
Rename CM files to LS
2010-06-11 17:42:16 +02:00
97d83c87ec
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:23:06 +02:00
8d5cec5e0d
Remove cmGetAvatarList()
2010-06-11 17:08:18 +02:00
b3cf5ccf6d
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:04:54 +02:00
7f349d61cb
Better friends notification: get rid of OnLogout and use OnClientClose for sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous.
2010-06-11 06:32:24 -07:00
2e1269e4ca
Bug fix on friends notifications. OnClientClose and OnLogout ordering are unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out.
2010-06-10 21:59:12 -07:00
b2b6799f1c
Added more debug messages to try to pinpoint where login is failing for nebadon.
2010-06-10 18:26:04 -07:00
e80cb815df
Bug fix on attachments: attach->drop->attach works now.
2010-06-09 12:51:24 -07:00
1dce243661
Merge branch 'master' into careminster-presence-refactor
2010-06-09 20:25:05 +01:00
2a71df1285
Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory.
2010-06-09 12:22:25 -07:00
18bfe58de8
Bug fix on attachments: don't delete the item from inventory when it's dropped on the ground.
2010-06-09 11:24:37 -07:00
8fc5eda2c9
Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong.
2010-06-09 10:55:37 -07:00
1be53b58a7
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:02:01 +01:00
30d3ea3d4b
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:00:24 +01:00
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
796e9b5cb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-09 03:52:24 +01:00
16439fa354
If a script is deleted before it gets compiled, don't even bother to try
...
compiling it
2010-06-09 03:51:43 +01:00
ca2abc43ad
Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
2010-06-08 16:44:18 -07:00
9b9804a498
* Changed CreatorIDs consistently to varchar(128)
...
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
20ea823c19
Merge branch 'master' into careminster-presence-refactor
2010-06-08 22:07:01 +01:00
6e2cc98eac
Fixed llMoveToTarget() and Rotation Lock/Enable (ChODE/ODEPrim only)
2010-06-08 16:15:16 -04:00
21246395be
Comment out the attachment update reordering mechanism in LLClientView since this doesn't appear necessary when the prim priorities are adjusted so that root prim updates are always sent before child prim updates.
2010-06-08 15:38:53 +01:00
db73b1c64e
Adjust object update priorities such that root prims are sent to the viewer before child prims.
...
This was originally a fix for huds, since child prims fail to display if the viewer doesn't receive the root prim update first.
However, on the advice of jhurliman, this has been done for all objects, both ordinary and attachments.
The separate mechanism in LLClientView which prevents child prim updates being sent out first is still present temporarily.
This is a foreport of the equivalent fix in 0.6.9-post-fixes, though that was for attachments only.
2010-06-08 15:32:18 +01:00
b6076d7b33
Reduce number of full updates sent on region crossing for attachments/huds to 1 from 3
...
This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update
This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one
This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed
This code is a foreport from the equivalent changes in 0.6.9-post-fixes
2010-06-08 15:07:57 +01:00
74d62901c8
Merge branch 'master' into careminster-presence-refactor
2010-06-07 00:44:36 +01:00
d91bd7646d
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:11:30 +01:00
fad5158ab4
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:09:44 +02:00
ab3afd5f42
* Bug fix in TP home: typo in unpacking of GridUserInfo.
...
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
fe3e1c67ae
Bug fix: update the list of friends upon MakeRoot, because child agents don't get notified of new friendships.
2010-06-05 06:56:36 -07:00
e962c44749
Fix support for PRIM_SCULPT_FLAG_INVERT and PRIM_SCULPT_FLAG_MIRROR in the llSetPrimitiveParams series of functions. This makes it possible to mirror a sculpt by script.
2010-06-04 19:36:31 -07:00
63797445be
various refactorings on methods to replicate IAR paths to user inventory in order to improve readability
2010-06-05 00:48:33 +01:00
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
72bd68a21f
add ability for load iar/save iar to take in arbitrary options
...
not used for anything yet
2010-06-04 22:17:23 +01:00
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
df2bcf7b6b
remove pointless mock user account service since the real one can now be easily configured for test purposes
2010-06-04 20:56:24 +01:00
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
281eb0c626
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-04 11:00:29 -07:00
952029380a
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
2010-06-04 10:59:59 -07:00
041f253e2b
minor: comment out region interface registration log msg I accidentally left in last week
...
also changes one log message to print out full exception stack trace on both mono/.net instead of just .net
2010-06-04 18:08:40 +01:00
dda7185b43
Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate
2010-06-03 17:55:50 -07:00
293f775fa5
Always provide at least 2 packets of a texture (if the texture is larger than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL.
2010-06-02 07:59:18 -07:00
aa5a346a68
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:21:55 +01:00
53e96dccef
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
655f02b695
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-02 01:05:36 +02:00
70aa965c26
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:04:17 +02:00
d8962ef415
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:01:56 +02:00
90c814a7ca
Fix nullref in cmGetAvatarList() (ported from 0.69)
2010-06-01 13:29:12 -07:00
a863eb9da3
One should not lock null objects.
2010-06-01 19:01:57 +01:00
6668c789d3
One should not lock null objects.
2010-06-01 19:01:21 +02:00
9c3c020697
Lock the object queue when dequeueing
2010-06-01 15:08:45 +01:00
c900134f91
Lock the object queue when dequeueing
2010-06-01 16:03:53 +02:00
5270e54268
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
...
needed libraries
2010-06-01 14:20:39 +01:00
16d8602d3c
Fix prim returns I broke earlier
2010-06-01 03:17:21 +02:00
4867dd135d
Fix prim returns I broke earlier
2010-06-01 02:12:56 +01:00
a5728cc91c
Fix prim returns I broke earlier
2010-06-01 02:10:53 +01:00
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
bde01e26e1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 02:10:11 +01:00
2fce7d9bcf
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
eca15cfbf2
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 02:45:14 +02:00
be69259981
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 01:39:54 +01:00
bf233ea0dc
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:27:30 +02:00
f57f2370f1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 01:25:24 +02:00
70f7790413
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 01:07:46 +02:00
9d4913224f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-31 19:00:36 +02:00
d4b4cbf5a5
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 19:00:02 +02:00
e515467c5e
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 17:55:56 +01:00
6c1665bf46
Fix casting in llParcelMediaCommandList so that it actually, you know, works
2010-05-31 08:38:41 -07:00
bbb4d6e4c9
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-31 01:02:04 +02:00
8df9f272eb
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:13 +01:00
890f3cc54c
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 15:46:54 +02:00
f1a1d7a521
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
59a5367433
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 13:46:05 +02:00
bfcac0ede8
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 12:45:16 +01:00
e3dac1292e
Implement suspended updates - When an operation is occurring on lots of prims in a single group, don't schedule any updates until the operation has completed. This makes things like llSetAlpha(LINK_SET,0.0,ALL_SIDES); a *lot* faster, more efficient and less buggy, and also makes unlinking a lot better. Linking is still treacherous.. this needs to be analysed.
2010-05-29 02:10:34 -07:00
3a5d379db8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-29 01:07:19 -07:00
2f409116db
Stop IGridService from throwing a fatal exception when an IPEndPoint cannot be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad.
2010-05-29 01:03:59 -07:00
191db0e6a4
get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears
2010-05-28 23:14:24 +01:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
a60ca5236c
restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService
2010-05-28 21:37:48 +01:00
505cb82dee
fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work
2010-05-28 21:14:15 +01:00
fff5459f4d
Add ability to load IARs directly from URIs
...
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
14c39461c2
minor: remove mono compiler warning
2010-05-28 19:41:13 +01:00
b1298fca0a
tidy up help information on load oar and save oar
2010-05-28 19:36:30 +01:00
d72435693b
refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers
2010-05-28 19:21:00 +01:00
6b568af565
Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
...
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:49:32 +01:00
877fe774ef
Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the object's corresponding single avatar update method, rather than calling the sceneviewer directly
2010-05-28 17:58:51 +01:00
596001632b
remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly
2010-05-28 17:53:57 +01:00
9ea42fdfab
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-05-27 21:31:10 -04:00
7d6680b38a
fix hanging output throttle arithmetic
...
had multiply overflow and subtract wrap-around errors
2010-05-27 21:28:47 -04:00
8fb706716b
Prevent a null ref
2010-05-27 19:09:06 +01:00
ba49319c07
Prevent a null ref
2010-05-27 20:08:48 +02:00
a48d7f62a7
Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
...
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
6b6425aa5e
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
f90d81a864
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 19:26:30 +02:00
9ac8d2de79
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 18:25:53 +01:00
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
5e719d13ef
fix sculpt normal direction for mirrored plane sculpts
2010-05-24 19:15:04 -07:00
00737f1c13
Merge branch 'master' into careminster-presence-refactor
2010-05-24 23:40:22 +01:00
7d9b316ce6
Change the way alpha is interpreted on prim text. Manris #4723
2010-05-24 23:37:47 +01:00
c7c9edd049
minor: expand upon comments about not scheduling two full updates for attachments
2010-05-24 20:11:06 +01:00
f84f0dbd51
Remove an unneeded conditional
2010-05-23 06:12:40 +01:00
72b96e8121
Add the SitGround flag back in
2010-05-23 06:12:11 +01:00
a9dad99432
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-05-23 06:09:54 +01:00
b2197e3b94
Apply http://opensimulator.org/mantis/view.php?id=4632
...
Adds dialog methods for MRM.
Thanks ziah.
2010-05-21 23:37:05 +01:00
074937e0e5
Apply http://opensimulator.org/mantis/view.php?id=4627
...
Adds OwnerId and CreatorId properties to MRM.IObject
2010-05-21 23:34:47 +01:00
e5bcd8b341
Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628
...
This prevents a ground-sitting avatar from being moved about in mouselook
Thanks mirceakitsune!
2010-05-21 23:29:37 +01:00
9e61e120a1
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 23:12:47 +01:00
4e45718833
Added overload of SendGenericMessage to LLClientView with string list as parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
2010-05-21 23:08:07 +01:00
6918446fcd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 22:17:58 +01:00
d0eecf0398
Added a sanity check before using m_config in the Scene constructor
2010-05-21 14:17:03 -07:00
abd5d1f747
* Added code comments to Prioritizer.cs that document how to add a new update priority policy
2010-05-21 14:04:10 -07:00
89f1ddb0a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 21:58:55 +01:00
5287c5f7fb
rearrange SceneGraph.AddSceneObject() to return earlier if an object with that uuid is already in the scene
...
this means that we don't perform pointless work
2010-05-21 21:57:56 +01:00
93ef65c690
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
...
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
2010-05-21 13:55:36 -07:00
4b518e0288
minor: remove LongRunning test designator from TestAddSceneObject() since it isn't, really
2010-05-21 21:48:47 +01:00
76135eec5b
add test to make sure that adding an object where one already exists in the scene with that uuid fails
2010-05-21 21:46:41 +01:00
8d968249ec
extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean
...
improve test to retrieve object by known uuid rather than dynamically assigned local id
2010-05-21 21:38:47 +01:00
f83acf533b
Fix a problem where SceneGraph.AddSceneObject() would return false on successfully adding an object rather than true, in defiance of its method documentation
...
This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added.
2010-05-21 21:22:53 +01:00
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
4e23acb133
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-21 21:04:17 +01:00
2b5b2f4e60
Add a new priority scheme that works like FrontBack, but completely deprioritizes
...
static prims, creating a hierarchy as follows:
0 == own avatar < other avatars < pysical prims < static prims
For a child agent, simply acts like FrontBack
2010-05-21 21:02:26 +01:00
721c1085da
make oar object filename/pathname creation a helper method
...
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
78a0fd5281
Only send dialogs and notices to root agents, not child agents
2010-05-21 17:22:39 +01:00
c0cb66e602
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:58:34 +01:00
1d6ab445ab
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:31:27 +01:00
9f2d1e9294
* Made PriorityQueue non-generic so it natively understands EntityUpdate structs
...
* Replaced the per-avatar seen update tracking with update flag combining, to avoid overwriting full updates with terse updates
2010-05-20 23:53:27 -07:00
344f209565
Merge branch 'master' into careminster-presence-refactor
2010-05-21 06:28:13 +01:00
af5eeab7cf
Ensure that the first update sent out for any given prim is a full update
2010-05-21 07:37:55 +02:00
792e149c7e
Ensure that the first update sent out for any given prim is a full update
2010-05-21 05:13:31 +01:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
d28da5e5ce
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-21 03:41:32 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
ddd072b3fb
Merge branch '0.6.9-post-fixes' into careminster
2010-05-21 02:44:20 +01:00
147c2d6f80
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 02:31:14 +01:00
13c22015e5
Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
2010-05-20 15:14:14 -07:00
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
56f3cb6da0
* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unless we were asked to
2010-05-20 12:04:12 -07:00
59dec2f989
* Added sessionID to IGridUserService.SetLastPosition(), as some connectors will want to track position against sessionID instead of userID
...
* Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
2010-05-20 11:51:57 -07:00
5532341bf9
Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo with kitto
2010-05-19 14:04:44 -07:00
6933b48a7e
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:49:34 -07:00
f77f9ecd8f
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:44:59 -07:00
fc76b5f589
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:24:54 -07:00
ba36c62caa
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:20:51 -07:00
bb0806c61e
Don't send kill packets to child agents as we close them
2010-05-18 03:44:09 -07:00
1c040d8c1e
Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it.
2010-05-18 03:24:43 -07:00
ed1cfb5245
Missed a nullref in the previous commit
2010-05-18 02:33:41 -07:00
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
eb5a95d26b
Prevent an "index out of range" error on login
2010-05-18 03:02:36 +02:00
c25c40a3f9
Following on from the last commit, the stop/disconnect packet should NOT be sent when the user logs out. This eliminates the annoying "crash on log out" bug, and allows the client to commit important information at the last moment (attachment data!)
2010-05-17 15:24:28 -07:00
6bc7e3429f
Provide interface to prevent the client close function from sending the stop packet
2010-05-17 14:32:21 -07:00
8f838c722d
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
2010-05-17 14:14:19 -07:00
d8bf370fd6
Merge branch 'master' into careminster-presence-refactor
2010-05-16 17:22:38 +01:00
b7e6b58857
Fixes mantis #4622 .
2010-05-16 09:01:27 -07:00
a723225179
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-16 15:02:23 +01:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
d4192dcb2e
* Revert last commit for now at Melanie_T's request.
...
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
019925bb2f
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-15 23:22:07 -04:00
dc1a3e9787
* Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files.
2010-05-15 23:21:36 -04:00
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
36bcab5f07
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-15 02:20:23 -07:00
98f2b798ff
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
2010-05-15 01:07:45 +01:00
3d72a73b22
Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
...
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:25:14 +01:00
4c740e1717
Implements three new OSSL functions for parcel management: osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
2010-05-13 14:22:48 -07:00
5d8638ed88
Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is working)
2010-05-12 16:05:48 -07:00
bf5c81d77e
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
2010-05-12 15:59:48 -07:00
fd37a21b59
Kill some locks that have crept into SOG
2010-05-12 08:34:47 -07:00
7705012ee7
Optimise the heavily used GetScenePresences; eliminate the array->list conversion on every call and transition from hard locks to ReaderWriter locks.
2010-05-12 08:25:40 -07:00
98bd3e1f34
Don't convert UUID -> ToString for every friend (Minor optimisation based on profiler feedback)
2010-05-12 07:14:06 -07:00
40e05f4109
Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)
2010-05-11 09:28:46 -07:00
14a86de115
Fix another ReaderWriterLockSlim issue
2010-05-10 12:45:33 -07:00
3cda854ef3
Fix overlooked readLock which was left open
2010-05-10 08:47:41 -07:00
ab716125d7
Correct an odd merge anomaly
2010-05-10 05:51:49 -07:00
2e94c75729
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-10 05:44:24 -07:00
2fe669448f
Greatly improve login time for users with large friends lists by requesting all unknown UUID's in one go rather than individually
2010-05-10 05:43:16 -07:00
fada4cb6c4
Merge branch 'master' into careminster-presence-refactor
2010-05-10 04:05:04 +01:00
31dc77d8a1
Return agents when angle is PI
...
Fixes Mantis #4703
2010-05-10 04:02:56 +01:00
3e8ceb3509
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-10 03:57:44 +01:00
89c762209c
Fix a null ref on region crossing
2010-05-10 03:57:17 +01:00
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
c1fe07b022
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
...
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
d72769930a
More cleaning on presence. Friends online/offline works again.
2010-05-08 07:44:07 -07:00
420dd78fb7
Merge branch 'careminster' into careminster-presence-refactor
2010-05-08 14:17:43 +01:00
14fcc2510e
Merge branch 'master' into careminster-presence-refactor
2010-05-08 13:31:36 +01:00
bfb7a49990
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
2010-05-07 21:56:14 -07:00
15562017f2
These files are part of the GridUserService write-up.
2010-05-07 21:32:02 -07:00
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
bc7d84b75c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-07 15:16:59 -04:00
add7abc1de
Fix Mouse+WASD makes Av rise; Fix PREJUMP.
2010-05-07 14:12:07 -04:00
eb6d63ab8e
improve handling of undersize sculpt textures
2010-05-06 23:02:24 -07:00
39c5ddc837
corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56
2010-05-06 22:08:59 -07:00
5d1e9947ed
Sculpt meshing refactoring - improves mesh accuracy and UV mapping
...
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
b309781f2d
Merge branch 'master' into careminster-presence-refactor
2010-05-07 01:00:58 +01:00
6182d71326
Also remove sale and search flags on god owner change.
2010-05-07 00:52:52 +01:00
907fce8406
Remove land that is being abandoned from search. This is now consistent with
...
sale and reclaim.
2010-05-07 00:50:26 +01:00
9ecebcdf13
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd25
2010-05-06 16:39:21 +01:00
69d0201d4c
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd25
2010-05-06 16:38:23 +01:00
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
533bd1bd9b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-06 16:08:24 +01:00
adc34c7129
Ensure the show in search flag is cleared on ownership change. Also, when
...
land is reclaimed, reset it's for sale flags so it can't be bought again right
away.
2010-05-06 16:07:15 +01:00
53594e599e
* Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
...
* Made previous Robust config changes consistent in Robust.HG.ini.example
2010-05-05 21:12:13 -07:00
02dea4ce58
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-06 02:02:12 +02:00
8b4f729a21
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-05 23:58:14 +01:00
ebc3726d52
Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
...
(XmlRpcGroups files want to be committed too)
2010-05-05 16:54:48 -07:00
2b48ed60ec
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-05 23:41:57 +01:00
7e0d5b8665
Merge branch 'master' into careminster-presence-refactor
2010-05-05 22:50:11 +01:00
2d9a20529d
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-06 00:54:21 +02:00
733a07e061
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-06 00:34:49 +02:00
ad2039a8c4
Stab a test fail
2010-05-05 22:48:05 +01:00
e45f5ac126
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-05 22:33:22 +01:00
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
e0f9b1a699
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 21:12:02 +02:00
7aed89a8d0
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 18:51:01 +01:00
8187fccd25
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:12:52 +01:00
91cfce3758
back port groups changes
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
8a69070b51
back port groups changes
2010-05-05 16:09:53 +01:00
6fdd5bfe2d
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
The patch was for 0.7
This reverts commit 608bb0dfef
2010-05-05 16:03:20 +01:00
608bb0dfef
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Mantis #4646
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 14:37:05 +01:00
efc3241541
Add perms check to the teleport home client command handlers.
2010-05-05 01:32:55 +02:00
34d882b70d
Add perms check to the teleport home client command handlers.
2010-05-04 23:15:07 +01:00
49efec2ef1
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 23:45:59 +02:00
3761f79971
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 21:26:10 +01:00
07e0732a10
make the events more useful by providing the source region
2010-05-04 21:16:20 +02:00
5a4cef6b36
make the events more useful by providing the source region
2010-05-04 18:55:24 +01:00
9ca79df802
Merge branch 'careminster' into careminster-presence-refactor
2010-05-04 18:41:20 +01:00
585259ef08
Merge branch 'master' into careminster-presence-refactor
2010-05-04 18:39:04 +01:00
97bbce92a8
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 20:57:31 +02:00
d997fc7b76
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 18:36:45 +01:00
ce86d39c70
Add "reload estate" command to sims
2010-05-04 18:31:52 +02:00
4f93d30790
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 18:10:13 +02:00
9cf0077bf9
Add "reload estate" command to sims
2010-05-04 16:11:06 +01:00
6eea0a3931
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 15:52:36 +01:00
dbce360566
Fix full circle sensors
2010-05-04 02:43:22 +02:00
c86259c671
Fix scripted give and interactive give to offline avatars. Both folder and
...
single items are now supported. Magic Boxes, yeah!
2010-05-04 00:44:05 +02:00
4df87631ed
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 23:44:23 +02:00
f61b879f2d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 21:25:40 +01:00
92561aef8d
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 21:25:02 +01:00
b10811a13b
Assorted bug fixes in hypergrid linking.
2010-05-03 09:50:55 -07:00
9c8d7d34b3
Fix a bug in owner change notification
2010-05-03 04:55:41 +02:00
8766401777
Adapt CM to the new CHANGED_OWNER handling
2010-05-03 04:28:30 +02:00
1494c84f56
Fix a bug in owner change notification
2010-05-03 02:40:52 +01:00
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
75063e8f60
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 01:31:32 +01:00
d6bfc490f7
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:45:01 -04:00
b836249926
* Untested Suggestion from lkalif to change
...
remoteClient.SendMapBlock(blocks, 0);
to
remoteClient.SendMapBlock(blocks, 2);
in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2010-05-02 20:44:34 -04:00
7a8ad1ceb2
Make in-place sale send CHANGED_OWNER again
2010-05-03 01:30:57 +01:00
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
af0ffb2a5a
Add URL_REQUEST_* script constants
2010-05-03 00:15:55 +01:00
0fa57cac3f
Fix sensor cone for sensing avatars
2010-05-03 00:54:24 +02:00
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
5f6e9e6ab9
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-02 08:18:33 -04:00
7ad36d3d75
Adding DebugEvent Trap
...
Adding XMREEvent Trap
trapDebug("Modulename" ,"My data here ", scene);
trapXMRE(int data, string Message, Scene scene);
2010-05-02 08:15:12 -04:00
7ae55f6248
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:29 +01:00
0a9c98e7c4
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:08 +01:00
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
3e30de7430
Fix linking issue introduced in my earlier commit
2010-04-30 22:35:07 +02:00
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
5fda81e6bb
* XInventory fairly tested, including for HG. Almost ready to switch.
...
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
486ab82c02
Fix some symbol errors
2010-04-30 12:08:37 +01:00
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
10750421a3
Fix some symbol errors
2010-04-30 12:07:47 +01:00
9500ba2ff5
Fix some symbol errors
2010-04-30 12:06:58 +01:00
13960b3b86
Merge branch 'master' into careminster-presence-refactor
2010-04-30 11:49:24 +01:00
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
f3c21524be
Fix Av jump motion S/W
2010-04-29 19:41:08 -04:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
f06772a088
Merge branch 'careminster' into careminster-presence-refactor
2010-04-29 23:33:20 +01:00
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
5c23b4aa56
Fix vertical attractor
2010-04-29 13:50:11 -04:00
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
aa56953411
Compiler.cs contained method GetCompilerOutput which, apparently,
...
was not used, but exactly the same path was calculated inline.
This patch does some minor refactoring by replacing inline path
calculation with GetCompilerOutput. This doesn't actually affect anything,
just minor prettifying of the code
2010-04-28 12:52:36 +03:00
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
8a32ee7dd2
Merge branch 'careminster' into careminster-presence-refactor
2010-04-27 03:58:43 +01:00
89a003c6fc
Merge branch 'master' into careminster-presence-refactor
2010-04-27 03:57:36 +01:00
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
56f60a04d9
Add an additional serialization call do the detach procedure. This call is
...
executed only for it's side effects, which are to block until attach(NULL_KEY)
completes, before commencing detachment.
2010-04-23 20:18:34 +02:00
85646b157c
Adding some more SNMP events and some refactoring
...
Signed : The Masqued Foxi
2010-04-23 12:40:27 -04:00
31e0704c8d
Remove debug output, the culprit has been identified
2010-04-23 17:48:50 +02:00
7eda9364fd
Adding LinkUp/LinkDown when a region is started or stoped.
...
Those two events could be used to compute the region availibility
2010-04-23 10:51:27 -04:00
780630d7c0
Fix a nullref in attachment handling. Add some debug to find the attachment
...
state issue
2010-04-23 14:41:20 +02:00
af778f09d5
Merge branch 'master' into careminster-presence-refactor
2010-04-21 19:51:17 +01:00
459323a931
Make the detection cone in attachments face in the direction of the avatar,
...
not the relative rotation of the attachment towards the avatar.
2010-04-21 19:44:19 +01:00
50f327ef5c
minor: change a comment and replace some magic numbers with the AssetType enum
2010-04-19 21:34:42 +01:00
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
da83ee28be
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
855eda844f
log problems when an asset request through the UDP TransferRequest channel goes wrong
2010-04-19 20:06:55 +01:00
de63b60748
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 19:27:45 +02:00
80024c023a
Remove the event trigger for the attach event from the attachment module.
...
The script engine already triggers this internally.
2010-04-19 18:44:21 +02:00
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
d2e4f2d376
Merge branch 'master' into careminster-presence-refactor
2010-04-19 15:33:20 +01:00
3e63ce6d9d
Make script asset fetches synchronous. Script instantiation synchronization
...
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
1667a29c88
And some more rez modes that weren't covered before
2010-04-19 12:54:33 +02:00
689b647790
And some more rez modes that weren't covered before
2010-04-19 10:54:41 +01:00
efa7873ae1
Merge branch 'master' into careminster-presence-refactor
2010-04-19 10:44:01 +01:00
b39db7e9e4
Also enable scripts rezzed into prims
2010-04-19 10:43:25 +01:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
72d380acf0
Merge branch 'master' into careminster-presence-refactor
2010-04-19 06:10:23 +02:00
68a4f897b4
This GetScriptErrors() change allows initial XEngine to run in background
...
thread. It should block only for the case of being called by
CapsUpdateTaskInventoryScriptAsset().
2010-04-18 19:19:16 -04:00
26e3884237
refactor: move DeatchObject() into the AttachmentsModule
2010-04-17 00:00:45 +01:00
ab3af43d5e
refactor: remove now unused internal method SendAttachEvent()
2010-04-16 23:29:36 +01:00
57c293d604
refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule
2010-04-16 23:15:13 +01:00
45563e20e0
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
2010-04-16 22:57:44 +01:00
17d023ba5b
refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule
2010-04-16 22:54:25 +01:00
e9926d13cf
minor: use the static ascii and utf8 encodings instead of instantiating our own
2010-04-16 22:38:42 +01:00
bf3956aeb0
Add --skip-assets option to load oar.
...
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
cf46735856
add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConnectorModule
...
the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations
2010-04-16 21:39:27 +01:00
5459a90fc6
minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place
2010-04-16 21:23:01 +01:00
9131a0d4a4
minor: stop datasnapshot issuing a warning log message if it's disabled
2010-04-16 21:12:09 +01:00
ccc56e6dd4
Merge branch 'master' into careminster-presence-refactor
2010-04-16 05:20:25 +02:00
a7449a82bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 19:49:02 -07:00
8fa13e3871
Patch from mcortez to add basic caching to the groups module. This prevents database/network explosions when you have a significant number of group-owned prims in a scene
2010-04-14 19:48:40 -07:00
e0f8362e7a
minor: add some documentation around the asset udp request path and replace some magic numbers with libomv enums
2010-04-14 22:31:11 +01:00
1636f535ba
Committing sacha's partial work (from orpheus). The GridBrat needs to learn
...
a bit of git
2010-04-14 10:42:14 +01:00
54a5b6f434
Reduce number of AvatarAnimations sent with large number of avatars
2010-04-13 18:50:08 -07:00
fac55bc78b
Change ISnmpModule to use scene references
2010-04-14 01:17:27 +01:00
4433f53f72
Drop unused Alert() method from ISnmpModule
2010-04-13 20:14:56 +01:00
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
a1c4585a39
Merge branch '0.6.9-post-fixes' into careminster
2010-04-13 04:13:26 +01:00
3d0860ae61
thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
9b6e89457c
Fixed LINEAR_MOTOR Z drive, Mantis #30
2010-04-11 14:12:01 -04:00
7ecd9b3f1a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
resolved
Conflicts:
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
2010-04-10 23:52:10 +02:00
c6ba50b7e2
Adding ColdStart event
2010-04-10 23:39:06 +02:00
0b2b2daf23
guarantee that a script engine's GetScriptErrors() will not be called
...
until after its OnRezScript() returns so that script compile error
messages can be retrieved
2010-04-10 14:43:26 -04:00
58dac970af
re-fixing this darn file
2010-04-10 18:05:08 +02:00
Tom