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
c4eaf195b5
dding this deleted file...
2010-04-10 17:59:08 +02:00
d975bd8e5c
Fixing Trap
2010-04-10 17:51:51 +02:00
7701ea2798
Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, can
...
be used to send snmp alerts
2010-04-09 06:49:14 +01:00
54cedfe432
Changed the GetTextureModule backport to work with the 0.6.9 codebase
2010-04-08 15:57:57 -07:00
0f3314c04c
Backported GetTextureModule and IAssetService.GetCached()
2010-04-08 15:00:01 -07:00
3f6c4c150e
* Adds IAssetService.GetCached() to allow asset fetching from the local cache only
...
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
d834a2c3da
Implement cmGetAvatarList(). This returns a strided list of all avatars in the region, including their UUID, position and name. The radar is often the most taxing scripts on a sim, this function can help radars reduce their impact by 66% by eliminating the need for sensors.
2010-04-07 23:53:08 +02:00
e80e04c5fd
Increase the amount of time we wait for a teleport to complete. This allows teleportation to a remote region without a local connection to the asset server without timing out.
2010-04-07 22:59:13 +02:00
309f440fc0
Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL. ( http://bugs.meta7.com/view.php?id=13 )
2010-04-07 10:13:47 +02:00
db5ea850f6
Fix llLookAt so that it doesn't "roll" the object and more closely imitates the behaviour in SL. ( http://bugs.meta7.com/view.php?id=28 )
2010-04-07 09:49:11 +02:00
20e3de1f0a
Add CHANGED_REGION_START (alias for CHANGED_REGION_RESTART as per LL Jira SVC-3773)
2010-04-07 08:28:57 +02:00
335c1b4420
Implement PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE
2010-04-07 07:48:26 +02:00
a97a887ea4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 23:25:46 -04:00
80346ad2e2
* May fix mantis #4603 .
...
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
e40acda6c8
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 23:22:14 +02:00
e7be131b89
Add the ISnmpModule interface definition to Careminster release
2010-04-05 23:20:56 +02:00
2f454843d8
Fix up my own shoddy code! Fixes prim rez break. Whups!
2010-04-05 23:17:06 +02:00
4bf1598930
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 16:15:23 -04:00
07b4889eab
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-04-05 22:11:11 +02:00
7a3bb266eb
This commit adds some randomness to object persistence. It's a Work In Progress, I am working on improving this to a tiered approach.
2010-04-05 22:11:05 +02:00
f34cc6b469
Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then.
2010-04-05 22:08:34 +02:00
48d2e8309a
check group membership and powers with the groups module rather than just the client's active group id
...
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
2010-04-05 20:44:19 +01:00
9b9e2a8c71
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 15:27:13 -04:00
1be19c7f42
log exceptions that end up at the top of a asynchronous viewer packet method call rather than swallowing them
2010-04-05 19:46:43 +01:00
2fbbc13c71
Fix some overlooked merge conflicts that got committed
2010-04-05 19:42:15 +01:00
9ecad50419
Partially implement share with group option for object inventory items
...
If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off.
If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active.
However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
2010-04-05 19:37:02 +01:00
35bf75a77a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 14:08:57 -04:00
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
fe034dc3e4
Merge branch 'master' into careminster-presence-refactor
2010-04-05 18:12:29 +01:00
f505c1d0a4
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-04-05 18:10:49 +01:00
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
e2a521742a
ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added 'fence' option to prevent physical objects crossing region border.
2010-04-04 22:57:32 -04:00
956225f0e1
Fixed Ban and parcel exclusion. Need to fix the parcel chat too
2010-04-04 18:29:18 +02:00
dc58c985e8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-04 02:24:52 +01:00
936e08e20e
Patch from mcortez. This appears to be a huge change to the groups module
...
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
2010-04-04 02:23:53 +01:00
cfa941adc7
Last commit was too fast... must override.
2010-04-03 12:14:57 -07:00
8f68edfe12
* Fail storing user accounts in the remote connector.
2010-04-03 12:11:54 -07:00
6485c576a1
* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
...
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
35c82a31db
Don't append ACKs to zerocoded packets. Although this should fine in theory, I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic
2010-04-02 16:25:14 -07:00
a004d88bf3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-02 14:53:52 +01:00
4b98d0db92
Adding the groups update (Mantis #4646 )
...
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
938905df1e
oops, add file missing from last commit
...
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
c33b1de9df
expose methods that allow region modules to send messages to groups
2010-04-01 22:37:20 +01:00
08ba34da03
First attempt at fixing mantis #4641 . It's better but there are now some issues with permissions.
...
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
21519d3311
Add missing licenses. Change relicensed LightShare module to proper BSD
...
licensing.
2010-03-31 13:33:18 +01:00
4fefd05839
Merge branch 'master' into careminster-presence-refactor
...
Remerge the LightShare bits that were pushed to core
2010-03-31 04:38:19 +01:00
19ae5e5dbb
Adding the LightShare module and scripting API. This code was written by
...
TomMeta and was contributed by Meta7.
2010-03-31 04:23:51 +01:00
ec637e2b8c
Committing the LightShare code, which was developed by TomMeta of Meta7.
...
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
7d917e7c5c
Rename Meta7Windlight to LightShare
2010-03-30 23:29:03 +01:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
8cb81bdc9b
minor: commented out code removal
2010-03-30 17:06:30 +01:00
696d711d15
Completely prevent full update packets being sent after kill object packets
...
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
2010-03-30 17:04:26 +01:00
24fc4703d0
fix build break. First argument of GetGroupRecord is not a uuid
2010-03-29 22:02:02 +01:00
e7e56e0143
Remove a redundant method body
2010-03-29 19:50:24 +01:00
607ed61ec2
Stab one bug. When joining an estate with a new region, make sure it's also
...
used on first run and not only later.
2010-03-28 23:18:25 +01:00
efc0916a01
May fix mantis #4613
2010-03-27 22:48:15 -07:00
05123c6bd5
* Fixed a dictionary value retrieval in GroupsModule
2010-03-26 12:39:22 -07:00
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
dd1c1b3bcd
Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one)
2010-03-26 11:08:14 -07:00
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
857918d3b0
minor: some debugging information and spacing changes to group module
2010-03-25 23:53:05 +00:00
f0703cad2c
add get group by name method to IGroupsModule
2010-03-25 22:47:52 +00:00
19c659ca99
fix unit tests broken by commit dcf18689b9
...
can't prompt for estate owner in unit tests
2010-03-25 21:46:23 +00:00
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
e0b287961f
Change land overlay to send group owned status properly
2010-03-23 17:04:37 +01:00
dcf18689b9
First stage of the new interactive region creation. This will allow creation
...
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
f020bd3206
Fix a nullref in permissions when returning objects via right-click
2010-03-20 15:49:39 +00:00
0f5fb6f190
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-03-19 19:14:09 -04:00
add47befac
Update acceleration to 0 on no tphysical.
2010-03-19 18:53:16 -04:00
5e65bef805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-19 15:17:15 -07:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
0e36994fe7
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-19 13:27:12 -04:00
3ea72eeabb
Fix sit with autopilot.
2010-03-19 13:26:34 -04:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
46d990419b
Merge branch 'careminster' into careminster-presence-refactor
2010-03-18 20:00:58 +00:00
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +00:00
69b5ddceda
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:56 +00:00
1a2cbbc8c1
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-18 18:58:44 +00:00
f35eb8819c
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:37 +00:00
734b0416de
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:57:29 +00:00
73e9b0be72
Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
...
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00
6df969894c
Fix AbsolutePosition for autopilot/sit.
2010-03-17 13:30:48 -04:00
e442c2a3f9
Prevent llTeleportAgentHome from affecting gods
2010-03-17 17:42:33 +01:00
b51f40da8f
Removed the unused use_async_when_possible config variable
2010-03-16 12:03:04 -07:00
b4dcdffb50
Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
2010-03-16 11:50:22 -07:00
37815f3402
Debugger tags for VS2010
2010-03-16 18:13:00 +01:00
45ef3e9987
Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen.
2010-03-15 20:32:36 -07:00
76106e39d9
Restoring LoadPlugin as it was before. Justin's last change made it throw.
2010-03-15 19:34:14 -07:00
4e180e84e2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-15 15:38:55 -07:00
33f5d0d1e9
* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context
...
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
2010-03-15 14:17:17 -07:00
a1cd3b5b88
Change GodLevel to UserLevel so gods can teleport freely without having
...
to enter god mode first
2010-03-15 17:54:39 +00:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
898fa637c3
Merge branch 'careminster' into careminster-presence-refactor
2010-03-15 17:12:08 +00:00
8cbd0d3b5f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-14 16:23:12 -04:00
8198062610
RotLookAt repaired; debug msg cleanup.
2010-03-14 16:22:13 -04:00
1e73e16fd0
flip UVs for profile faces
2010-03-13 18:41:36 -08:00
2ebc4be99d
add a null check in ScenePresence constructor
2010-03-13 12:04:49 -08:00
80e4068b3e
Fix the delay in llGiveInventory so that it only takes effect when giving inventory to an avatar (this now replicates SL behaviour)
2010-03-13 15:13:19 +01:00
41a98b902b
correct some references which could produce erroneous prim face numbers
2010-03-12 22:05:22 -08:00
1d14cf8c3f
some improvements to sculptmap alpha handling and LOD
2010-03-12 21:21:28 -08:00
315fa06c75
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
2010-03-12 23:20:38 +00:00
6828d8ecbe
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 22:49:16 +00:00
582375509c
refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule
2010-03-12 22:48:49 +00:00
5beb08be31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 14:40:21 -08:00
b9f5cd75bc
refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule
2010-03-12 22:39:15 +00:00
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
19b4770fe7
start laoding griduser local connector, though it isn't invoked by anything yet
2010-03-12 22:18:48 +00:00
1379ae4310
Fix Rotation Lock. NOTE: This version had poor border crossing control
2010-03-12 16:13:52 -05:00
f2de50bb14
Fix tests broken in 88771aeed3
...
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
2010-03-12 19:31:14 +00:00
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05:00
b18ca2fee6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-10 14:06:12 -08:00
2af97b46ec
* Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debug line, and commented the debug line out since it can quickly become noisy
2010-03-10 14:05:49 -08:00
04a6b1caf8
Reintroduce a check that was dropped from permissions
2010-03-10 05:31:34 +00:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
c5bb51b443
Changed a cryptic debug message and a wrong comment
2010-03-09 17:33:31 -08:00
dbb2edf1a6
Fixed caching of user accounts.
2010-03-09 17:09:44 -08:00
689514a40a
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:12:10 +00:00
88771aeed3
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:11:28 +00:00
40873504dc
Merge branch 'master' into careminster-presence-refactor
2010-03-09 22:46:17 +00:00
c7590bfd50
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-09 22:44:14 +00:00
98f91a252c
- parcel blocking, region crossing blocking, teleport blocking
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
fce9e499e4
- parcel blocking, region crossing blocking, teleport blocking
2010-03-09 22:38:58 +00:00
80b5a95bb8
Revert "Adds Land Banning."
...
This reverts commit a87d7a1296
2010-03-09 22:29:02 +00:00
06e351f1ef
Revert "Adds land ejection and freezing. Adds more checks to land banning."
...
This reverts commit 44d523518a
2010-03-09 22:28:52 +00:00
4b8af2e1aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-09 12:19:11 -08:00
01218093a6
* Typo fixes
...
* Performance improvement in the expensive GenerateClientFlags()
2010-03-09 12:06:53 -08:00
5caae0293a
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
Backport from head.
2010-03-09 18:53:04 +00:00
2362da2ad0
Add config option for switching between CSJ2K and BuggyJPEG.
2010-03-08 20:29:26 +00:00
fa38cf3ee8
* Added code to support either CSJ2K or OpenJPEG texture decoding. Currently hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option
2010-03-07 17:03:56 -08:00
49baf090cd
Small consistency change
2010-03-07 16:08:00 +00:00
c8c608acc8
Small consistency change
2010-03-07 16:07:40 +00:00
3d053b194a
Small consistency change
2010-03-07 16:06:52 +00:00
89a739b45f
Small consistency change
2010-03-07 16:05:24 +00:00
2e5f7ec926
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 20:05:33 +00:00
2dcf73dd93
- supporting llTextBox
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
f4c165afe7
Bug fix: store correct position information upon logout. Fixes mantis #4608
2010-03-06 08:21:54 -08:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
2fdd535302
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-06 12:24:26 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
83929c69e3
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
9fa9cfd215
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 11:58:19 +00:00
c0bc25059c
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:52:59 +00:00
6aed4323a3
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-05 21:37:18 -08:00
5171464ac1
Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.
2010-03-05 21:36:45 -08:00
27b8d13057
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-05 17:05:15 -08:00
36afd0bfd1
* Cache packed throttle data to avoid repeated allocations in CheckForSignificantMovement()
...
* Removed a lock on "return m_neighbours.Count" in GetInaccurateNeighborCount(). Dictionary<>.Count by itself does not benefit from locking
2010-03-05 17:04:20 -08:00
cde3c20ba3
* Fixed an order of operations bug in CheckForSignificantMovement() that was causing a flood of child updates to neighbors on login
...
* Removed an unnecessary call to the presence service
2010-03-05 17:01:31 -08:00
395f343498
refactor: Move DetachSingleAttachmentToInv to region module
...
need to rationalize method names later
2010-03-06 00:07:47 +00:00
71797af540
refactor: move another AttachObject method
2010-03-05 23:35:49 +00:00
b72c2dc6e8
refactor: move user inventory side of RezSingleAttachment to module
2010-03-05 23:29:24 +00:00
60553e62a3
refactor: begin to move attachments code into a region module
2010-03-05 23:18:47 +00:00
e906dd3d28
add initial UserGrid service classes as per diva's direction
...
this will initially store home location data instead of the presence service
compiles but not enough to actually test yet
2010-03-05 22:29:51 +00:00
e39fc95659
Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
...
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
8bd114b4df
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-05 00:27:24 +00:00
87590491b5
Fix Physics angular reference frame.
2010-03-04 16:33:26 -05:00
e07548d703
move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
2010-03-04 20:08:25 +00:00
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
62dd83f473
Remove a superfluous array creation
2010-03-04 10:47:16 +00:00
84b0a23e19
Remove a superfluous array creation
2010-03-04 10:45:46 +00:00
31f7e06c25
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-04 10:43:12 +00:00
5d2f854288
Remove a superfluous array creation
2010-03-04 10:38:03 +00:00
716e6f20e1
compiler warnings revealed that public PlaySoundSlavePrims properties were changing the wrong protected fields.
...
correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
2010-03-03 23:40:32 +00:00
c4ba2e5dfb
minor: remove some compiler warnings
2010-03-03 23:35:23 +00:00
8305e6af07
refactor: push sog.SendPartFullUpdate() down into sop where it better belongs
...
no functional changes
2010-03-03 23:29:09 +00:00
a0b22a9adc
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-03 22:48:41 +00:00
edb176447b
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
2010-03-03 22:14:06 +00:00
fc233d4e1e
* Adjusted the significant movement magic value from 0.5m to 2.0m and added an explanation of what it does
2010-03-03 12:34:21 -08:00
13a8d11c46
Removing the sLLVector3 dinosaur
2010-03-03 12:12:32 -08:00
94a3e60bd0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-03 11:03:56 -08:00
a6e23a3275
* Fixed bad start position clamping in MakeRootAgent()
2010-03-03 10:59:05 -08:00
660ebe52cf
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-03-03 18:40:33 +00:00
1c68ad2bba
remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
...
this allows the tests to pass on my local system
2010-03-03 17:50:05 +00:00
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
14073831d2
Fixes Region.Framework tests. Although these tests don't fail, they need to be rewritten, because they are doing agent manipulations in the wrong way, so they're fairly meaningless.
2010-03-02 07:53:52 -08:00
00e6739b7d
Offline friendship offers now working.
2010-03-01 22:21:33 -08:00
c6a5ff26ff
Friends rights under control.
2010-03-01 21:32:55 -08:00
cfaf087b89
More work on GrantRights. Still not right.
2010-03-01 09:23:33 -08:00
b8d89ac6da
Fix -1 checks for login case
2010-03-01 02:57:25 +00:00
dc22e74033
Small tweak
2010-03-01 02:54:18 +00:00
38ea1dd5c8
Merge branch 'master' into presence-refactor
2010-03-01 01:01:32 +00:00
65fadd2f67
Should have things the right way around, better that way
2010-03-01 00:20:34 +00:00
bfcc57c071
Change friends to handle offers as it was originally designed. This may
...
need to be changed in SQLite & MSSQL as well
2010-03-01 00:02:14 +00:00
adb9cc2af9
Implement rights changes locall (UNTESTED)
2010-02-28 23:26:13 +00:00
86c621fdc7
Change the signature of SendChangeUserRights, because we have to send
...
this to both parties
2010-02-28 22:56:31 +00:00
44e7224b86
Add missing ChangeUserRights packet sender
2010-02-28 22:47:31 +00:00
5c5966545d
Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there.
2010-02-28 12:07:38 -08:00
db24e57cab
Friends connectors finished. Status notification working across the board. One last bug: friends online upon login are not being sent to the user.
2010-02-28 08:36:13 -08:00
1daabc3473
Status notification (online/offline) working for same sim.
2010-02-27 18:16:31 -08:00
593fd54fc7
Update the local cache upon friendship acceptance. Logout notifications working.
2010-02-27 11:23:31 -08:00
a234672db8
* Finished implementation of FriendsService.Delete
...
* Deny now working
2010-02-27 10:57:57 -08:00
3906a14857
Friends online notifications upon friendship now working (same sim only).
2010-02-27 10:24:55 -08:00
a4472ceeac
Implement the requestonlinenotification method
2010-02-27 15:50:41 +00:00
0ab65899e4
Move requestonlinenotification generic message to presence module
2010-02-27 15:37:00 +00:00
6f770af5fb
Implement a handler for requestonlinenotification generic message
2010-02-27 15:25:51 +00:00
de5c2801e8
Friendships established.
2010-02-27 08:14:37 -08:00
25870e8049
* Friendship offers starting to work in the same sim. Not quite right yet.
...
* Added skeleton for out Connectors/Friends/FriendsSimConnector.cs
* Moved request handler to its own file
2010-02-26 20:35:45 -08:00
dc88dc2c3d
More flesh to FriendsModule. Still incomplete.
2010-02-26 17:33:08 -08:00
dfc17a531f
Add the client message handlers. The calling card handlers that are part of
...
the old friends module are omitted intentionally, as I believe those should
be in a calling card module, not bundled with friends.
2010-02-26 21:37:07 +00:00
bbb43f9bde
Now showing friends online upon grid login.
2010-02-26 10:35:23 -08:00
93967d4a1c
fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
...
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00
1a3ad3ae80
Implement local online/offline notifications
2010-02-25 23:32:38 +00:00
161d16405d
Check flags on initial login
2010-02-25 23:04:05 +00:00
7f61de8f57
Allow particles and texture anims to be persisted to XML. This behaviour is expected.
2010-02-25 14:14:53 +01:00
e99341d7df
llDie() should not work on attachments (results in an incosistent attachment state)
2010-02-25 12:07:56 +01:00
efd4810851
Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon.
2010-02-25 12:04:51 +01:00
44d5b2910f
Implement initial online notifications
2010-02-25 04:22:51 +00:00
f2b36f8e76
Implement friend perms
2010-02-25 04:02:03 +00:00
b97f3860cb
Begin tracking users and friends
2010-02-25 03:55:21 +00:00
e776bf9316
Grab the presence module and load the friends connector into the friends module
2010-02-25 03:07:46 +00:00
c7b1e76eb5
Add the stream handler/listener and requisite methods to the friends module
...
for the friends interregion comms.
2010-02-25 01:46:34 +00:00
267f3b8147
Fixed typo that was affecting the BasicInventoryAccessModule
2010-02-24 08:03:30 -08:00
4aa37e995d
Remove the overlooked remnants of core profile support
2010-02-24 06:28:16 +00:00
c6dd670d58
Streamlined error logging for malformed packets and fixed a bug when printing the hex dump
2010-02-23 14:58:36 -08:00
d506449f67
* Removed the unused GridRegion.getInternalEndPointPort() (just use InternalEndPoint.Port). This class is complex enough as it is
...
* Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space
* Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening
2010-02-23 00:59:24 -08:00
df76e95aa2
Changed asset CreatorID to a string
2010-02-22 14:18:59 -08:00
71c6559a91
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-22 14:10:19 -08:00
7665aad002
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
2010-02-22 13:27:17 -08:00
300f4c58a6
Separate PhysX classes into separate files.
2010-02-22 13:16:40 +09:00
2dea162073
Formatting cleanup.
2010-02-22 12:25:59 +09:00
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
2e7aa387f7
One more test running.
2010-02-21 19:11:48 -08:00
70de6956ff
Small bug fixes for making tests work.
2010-02-21 18:56:44 -08:00
552e9e8c78
* Added SQlite connector for AvatarData. Tested -- works.
...
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
845a390e93
* Added a sanity check for missing asset data in LLClientView
...
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
2010-02-20 16:21:13 -08:00
d1f2fae348
Formatting cleanup.
2010-02-20 11:02:06 +09:00
68b494b2cc
Apply http://opensimulator.org/mantis/view.php?id=4495
...
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
2010-02-19 22:44:33 +00:00
8294fbd069
minor: remove mono compiler warning
2010-02-19 22:31:53 +00:00
c767a7901c
forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is
2010-02-19 22:30:46 +00:00
214b1351fb
minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/config-include/FlotsamCache.ini.example
2010-02-19 21:18:03 +00:00
842b68eeff
Change handling of the SYSTEMIP constant to be more sane.
...
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
10f94a3c33
remove old commented out switch statement in LLClientView since this has successfully been split into separate methods for quite some time now
2010-02-17 21:13:31 +00:00
95a31c9b6f
minor: fix error inserting field in log message
2010-02-17 20:57:29 +00:00
92a8d7ce6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-16 23:15:59 +00:00
d6eff8ebcf
Change a condition to actually make linden land reclaim work
2010-02-16 23:14:57 +00:00
4c90ee2943
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-16 19:08:06 +00:00
052f2b3e27
minor: Make SOG.DelinkFromGroup() return the newly delinked scene object instead of void
2010-02-16 14:36:08 +00:00
af2d20c5fa
Fix an inconsistency in llSetPayPrice between SL and OS behaviour
2010-02-15 22:22:36 +01:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
47a9e48f46
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-02-15 06:15:14 +01:00
94c417c90c
Implement missing llGetPrimitiveParams parameters
2010-02-15 06:10:04 +01:00
5c7acd0d4d
Fixes a bug in the previous patch.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-15 01:07:02 +00:00
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
ce3e265575
Plug a small hole
2010-02-15 00:06:03 +00:00
2c0c21d0a5
Plug a small hole
2010-02-14 23:58:54 +00:00
b2fefe3e3f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-14 22:27:59 +00:00
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
aad95fcff5
minor: remove completely commented out and unused class
2010-02-12 22:45:59 +00:00
802a969267
Fix http://opensimulator.org/mantis/view.php?id=4224
...
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
9568718add
Angular motor adjustments
2010-02-12 15:56:21 -05:00
6a70349512
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-12 14:08:32 -05:00
ad38450f9c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-08 22:43:53 +00:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
1d75ad9fd5
Merge branch 'master' into presence-refactor
2010-02-08 21:54:26 +00:00
aba5908860
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-08 21:39:46 +00:00
ad28db3669
add some method doc to IDynamicTextureManager
2010-02-08 21:21:21 +00:00
59851ceee6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-08 14:29:06 -05:00
9f4883d146
refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObject since this wraps a check that is much less clear
2010-02-08 19:10:54 +00:00
00947cf2ca
Add EventManager.OnIncomingSceneObject event which is triggered by an incoming scene object
...
Add a read-only Attachments property to ScenePresence
2010-02-08 19:02:20 +00:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
fabf10f1cf
endline fix 2
2010-02-06 00:38:22 -05:00
59f6606ecf
Endline fix
2010-02-06 00:37:07 -05:00
bf9fc69d01
minor: log what kind of wearable cannot be found
2010-02-05 19:34:25 +00:00
68bb2dac45
Revert "Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)"
...
This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules)
This reverts commit 7058a4c259
2010-02-05 19:21:27 +00:00
7058a4c259
Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)
...
If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example)
Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects
2010-02-05 18:09:27 +00:00
044979066c
Fix two inconsistencies with LightShare
2010-02-05 00:53:32 +01:00
0a084a31e9
refactor: chain two ScenePresence constructors together to eliminate common code. No functional changes
2010-02-04 23:23:07 +00:00
16467f6654
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-04 22:22:18 +00:00
f1b99c4a7f
minor: one method doc
2010-02-04 21:35:56 +00:00
8556a9f1a8
Applying patch #4534 by Misterblue to fix ODE physics stickiness
2010-02-04 13:31:06 -08:00
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
2953bee1f4
Revert "change position of OnAttach event firing so that this also happens when a user teleports into a region"
...
The behavior introduced here is not compatible with SL
This reverts commit b6bee4999c
2010-02-04 17:11:06 +00:00
ae9362636e
Line endings cleanup
2010-02-04 17:00:16 +00:00
0ab8dd61d7
Finally cutting the gordian knot. Friends needs to be both a module and a
...
service, and never the twain shall meet. This finally opens up the path to
a working friends implementation
2010-02-04 12:21:14 +00:00
f9a61f2825
Some interface and data structure changes, add the missing method in friends
2010-02-04 10:51:36 +00:00
b1dfcccc9a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-03 22:14:58 +00:00
48134af616
Motor angular decay fix.
2010-02-03 16:20:13 -05:00
bde7f361fa
minor: remove one mono compiler warning
2010-02-03 19:46:33 +00:00
7c69badd3d
minor: remove one mono compiler warning
2010-02-03 19:34:08 +00:00
fc1ac25935
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-03 14:32:29 -05:00
2c7672a2b9
minor: add a smidgen of EventManager doc
2010-02-03 19:27:44 +00:00
cd4651041e
For each delegate added to events in the EventManager, catch and log but do not propogate any exceptions that come back
...
This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
2010-02-03 19:04:31 +00:00
daa66c4811
add an IsRoot property to sop
2010-02-03 16:40:21 +00:00
c020fed1b8
minor: comment out a log line in ScenePresence
2010-02-03 15:46:24 +00:00
da62344822
minor: remove a couple of mono warnings
2010-02-03 15:40:59 +00:00
b6bee4999c
change position of OnAttach event firing so that this also happens when a user teleports into a region
2010-02-03 15:35:41 +00:00
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
88d0fc3b09
allow terrain collision events after regular collision check
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
bbd41de6d5
refactor: move world comm message queueing into its own method
2010-02-02 20:38:58 +00:00
0faeaf98a6
minor: copy some method doc from the WorldComm implementation to the interface
2010-02-02 19:42:45 +00:00
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
8c20610293
AngMotor update 1
2010-02-02 13:28:42 -05:00
0e23c5fffb
minor: add some documentation to EventManager.OnObjectGrab
2010-02-02 18:19:15 +00:00
96d5c8196a
minor: add reminder to lock SOG.Children before using it directly in order to avoid threading issues
2010-02-02 15:45:41 +00:00
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
6478617c93
Revert "improve locking of m_items in SceneObjectPartInventory"
...
This reverts commit 968b9e160d
2010-02-02 03:49:00 +00:00
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
3863cd1d23
Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it
2010-02-01 21:35:05 +00:00
4c1740f7d8
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-02-01 20:15:36 +00:00
53a01dc422
Don't try to start attachment scripts or send updates if the attachment itself has been unsuccessful
2010-02-01 20:06:43 +00:00
8466f13976
Bug fix for getting region flags.
2010-02-01 07:53:55 -08:00
35a245b67a
Assorted bug fixes related to hyperlinking
2010-01-31 22:35:23 -08:00
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
40d8e91008
* Added a few files that were missing in the repo.
...
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
0473454876
Added missing file.
2010-01-31 11:04:32 -08:00
a0d79e621c
Bug fix: change HGBroker to a INonSharedRegionModule
2010-01-30 15:43:10 -08:00
42f978a478
* HGScene is no more.
...
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
81a6f9a515
On the way to making HG inventory work. Inventory can now be accessed again. Assets are still broken.
2010-01-29 19:33:50 -08:00
5001f61c08
* HGGridConnector is no longer necessary.
...
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
4c1365f149
apply http://opensimulator.org/mantis/view.php?id=4486
...
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
2010-01-30 00:15:37 +00:00
05a3e37b85
Apply http://opensimulator.org/mantis/view.php?id=3334
...
Send continuous touch() events if the left mouse button is held down while moving over an object
This conforms with Linden Lab practice
Thanks Revolution
2010-01-29 23:12:08 +00:00
7b53067d6d
Apply http://opensimulator.org/mantis/view.php?id=4548
...
Fix command params check on fcache expire <datetime>
Thanks coyled
2010-01-29 21:52:13 +00:00
0cf88b34c9
use common sop2 setup for TestMergeOarV0_2()
2010-01-29 21:45:07 +00:00
68c7218fa1
make TestSaveOarV0_2() use a common part2 construction
2010-01-29 21:42:27 +00:00
0c3043a298
use common part1 createio nin TestMergeOarV0_2()
2010-01-29 21:37:25 +00:00
055d991cc1
minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()
2010-01-29 21:33:11 +00:00
75dcd721de
use common part1 creation in ArchiverTests.TestLoadOarV0_2()
2010-01-29 21:27:14 +00:00
115e66218e
refactor out scene object 1 creation n ArchiverTetss
2010-01-29 21:10:14 +00:00
c1da07e4eb
factor out scene setup in ArchiverTests
2010-01-29 20:59:56 +00:00
968b9e160d
improve locking of m_items in SceneObjectPartInventory
2010-01-29 20:36:13 +00:00
ae2174d8f5
Add method to get all items with the same name from a particular prim
...
Extend load oar test to check loading of a sound item
2010-01-29 18:11:53 +00:00
0c81966c0a
Works for grid login.
2010-01-29 09:12:22 -08:00
0c5850237e
Small fix for a spurious exception
2010-01-29 16:50:00 +00:00
9e37d24624
Prevent empty ObjectProperties packets being sent
2010-01-29 11:47:45 +00:00
44c86cedcf
Resolve one more conflict I overlooked
2010-01-29 07:47:50 +00:00
536a6bac72
Resolve one more conflict I overlooked
2010-01-29 07:42:45 +00:00
a87a247f05
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
2010-01-29 07:21:06 +00:00
cfca9e1e81
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
2010-01-29 07:20:13 +00:00
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
5b9ca6e35f
Merge branch 'master' into careminster
2010-01-28 14:38:46 +00:00
ee12b00cfa
Fixes inconsistencies in the permissions module. Adds a region_manager_is_god
...
configurable. Previously, estate managers could enter god mode, but would
not have any powers. Now estate managers can enter god mode only if this
option is true, and then will have real god powers.
2010-01-28 14:34:31 +00:00
862caa72a8
Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land.
2010-01-28 03:04:38 +00:00
2d9b69c186
Merge branch 'master' into careminster
2010-01-28 02:07:18 +00:00
6478bc9fb0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-28 02:05:32 +00:00
c26f1d1bfa
Changes WorldCommModule to ISharedRegionModule.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-28 02:05:05 +00:00
7c00469cd2
Added ExternalName config on Gatekeeper.
2010-01-27 08:00:29 -08:00
bc68f77396
* A few other endlines...
2010-01-26 12:41:37 -05:00
8284fc8e22
* Fix Endlines in IRCClientView.cs
2010-01-26 12:19:38 -05:00
5e58bca86d
* Fix Endlines in MyNpcCharacter.cs
2010-01-26 12:15:49 -05:00
e9c9a74e0a
Some merge fixups
2010-01-26 15:12:41 +00:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
72dd680dd3
Replace dome tabs with spaces
2010-01-26 14:46:53 +00:00
19484891bb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-26 14:44:07 +00:00
38cfc9366c
Fix a problem where llDie() calls were sometimes leaving dead objects behind.
...
When an object was deleted, the remove script instance call was aggregating the scripting events as normal.
This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket)
On some occasions, the QuitPacket would be sent before the full update was dequeued and sent.
In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5),
a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties
and cannot be removed from the viewer except by a relog.
This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
2010-01-25 21:51:58 +00:00
70465f4c90
Removed obsolete interface IHyperlink.
2010-01-24 16:23:18 -08:00
ea3d287f70
Some method implementations were missing from LocalGridServiceConnector.
2010-01-24 15:04:41 -08:00
48b03c2c61
Integrated the hyperlinking with the GridService.
2010-01-24 14:30:48 -08:00
fe06f0dd05
Fixes Region Crossings on a prim.
2010-01-24 11:35:30 +00:00
1254a5e50c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-23 15:19:05 +00:00
ec3c31e61e
Updates all IRegionModules to the new style region modules.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-23 15:18:52 +00:00
1df69be9a6
Add first part of test for checking restore of task inventory items on oar load
...
Passes but not yet complete
2010-01-22 20:32:34 +00:00
a0e4665077
complete assertion checks of all other oar loaded region settings
2010-01-22 17:17:25 +00:00
2308b375a7
minor: remove warning from LLClientView
2010-01-22 16:26:42 +00:00
5f5fdc3624
Allow oar loading to work even if an estate module is not present
...
Write bare bones unit test for region setting loads
2010-01-22 16:22:23 +00:00
e61f42ad3a
add a target position to agent updates to ScenePresence to support alternative client protocols
2010-01-21 23:59:04 -08:00
d2e17f4ffb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-01-21 23:48:11 +00:00
1abb70cc73
Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.
2010-01-21 19:31:02 -05:00
946e06eb58
Merge branch 'master' into careminster
2010-01-21 23:47:40 +00:00
14e62c096d
Fixes llSetDamage. Patch from Revolution
2010-01-21 23:30:49 +00:00
66692f90e3
ChODE Object Linear Motion update
2010-01-21 14:39:11 -05:00
a964431c21
Merge branch 'master' into casper
2010-01-20 22:19:14 +01:00
496a8a4f7c
Fixed an issue with PayPrice sometimes being shared between multiple objects
2010-01-20 22:14:43 +01:00
c211a120a5
Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
5908b8ed7c
Change a member of the friendslist module to better reflect the client side
...
data storage paradigm of the friends list and avoid repeated, unneccessary
fetches of the entire friends list.
2010-01-19 11:33:42 +00:00
24056dc98b
Adds example to OpenSim.ini.example for Admin Default Parcel settings
2010-01-19 01:46:50 +00:00
3d53694415
Go Home works. With security!!
2010-01-18 16:34:23 -08:00
fd64823466
* Added missing GatekeeperServiceConnector
...
* Added basic machinery for teleporting users home. Untested.
2010-01-18 10:37:11 -08:00
e3dbd79543
Merge branch 'master' into careminster
2010-01-18 17:24:21 +00:00
bbbe9e73cc
* Fixed misspelling of field in GridService
...
* Moved TeleportClientHome to EntityTransferModule
2010-01-18 09:14:19 -08:00
d9c48e70a9
Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.
2010-01-18 17:56:27 +01:00
3ff28e7a8f
Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.
2010-01-18 16:52:06 +00:00
b5fcb5e872
HG teleports through gatekeeper are working.
2010-01-17 20:10:42 -08:00
51bb311565
Add chat banning. Staff patch
2010-01-18 02:53:31 +00:00
b2e6ec9e12
Agent gets there through the Gatekeeper, but still a few quirks to fix.
2010-01-17 18:04:55 -08:00
f4e30664e6
Fix a typo
2010-01-18 01:55:54 +00:00
44d523518a
Adds land ejection and freezing. Adds more checks to land banning.
2010-01-18 01:27:01 +00:00
5e034f5933
Oops, forgot this one.
2010-01-17 11:35:27 -08:00
f276ba57bf
HG agent transfers are starting to work. Gatekeeper handlers are missing.
2010-01-17 11:33:47 -08:00
bd4d94a4f5
Hyperlinking minimally tested and working.
2010-01-17 07:54:03 -08:00
04e29c1bac
Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet.
2010-01-16 21:42:44 -08:00
ee1fb81376
Finished moving object crossings into EntityTransferModule
2010-01-16 08:42:20 -08:00
bd6d1a2444
Moved prim crossing to EntityTransferModule. Not complete yet.
2010-01-16 07:46:07 -08:00
74b3ce8572
Let monitor data be requested using either the short form of the name or the
...
full, namespace qualified version.
2010-01-16 04:57:49 +00:00
dc6d37d2fe
Merge branch 'master' into presence-refactor
2010-01-16 04:40:33 +00:00
c9276f2051
Shorten the names of the tags in monitorstats summary to the immediate type
...
name sans namespace. Needs adjustment of scripts using these!.
Request my name still uses full namespace path.
2010-01-16 04:38:24 +00:00
32bfbdab6f
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-15 17:24:41 -08:00
f5cba18600
Comment
2010-01-15 17:17:24 -08:00
4ac3c0e81b
Renamed IAgentTransferModule to IEntityTransferModule -- accounts for objects too.
2010-01-15 17:14:48 -08:00
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
f1c30784ac
* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.
...
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
2010-01-15 15:11:58 -08:00
884410501e
Allow renaming of items that contain no-mod items
2010-01-15 20:19:06 +00:00
e9d376972f
Added a UserAccountCache to the UserAccountServiceConnectors. Uses a CenomeCache.
2010-01-14 08:05:08 -08:00
e90a5895ad
Bug fix in releasing agent. In Scene, always use SimulatonService, and not m_SimulationService, because it may be null...
2010-01-13 21:32:48 -08:00
a87d7a1296
Adds Land Banning.
2010-01-14 04:11:17 +00:00
daa9866a9a
Omit AuthorizationService from the default configurations, because the service doesn't exist in the distribution.
2010-01-13 19:25:33 -08:00
f0152790cf
Merge branch 'master' into careminster
2010-01-14 01:20:07 +00:00
640712fe88
* Removed debug messages.
...
* Everything works! (everything that was tested; lots of things to test)
2010-01-13 09:38:09 -08:00
4de82891a9
Bug in Teleport fixed -- Appearance was missing from AgentCircuitData.
2010-01-13 09:34:08 -08:00
7356860b48
Several more buglets removed.
2010-01-13 09:17:30 -08:00
e3a04fcb7b
Change the error messages on region region registration. This changes URM
...
and region. The non-error case should be compatible, so no version bump.
Untested.
2010-01-13 03:08:34 +00:00
a8b1a57cd1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-01-12 10:27:21 -08:00
a4a0512011
Bug in llGetNumberOfPrims always returns to script when no clients are connected to the simulator.
2010-01-12 10:23:36 -08:00
011a1b3798
More appearance woes fixed, this time for child agents. Tested on a grid with 2 simulators. Everything seems to be working, including border crosses. TPs (prim crossing) need love now.
2010-01-12 09:49:27 -08:00
66920a9047
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
2010-01-12 09:22:58 -08:00
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
4e7c449c5a
This fixes the problem that region modules (new style) weren't being recognized.
2010-01-11 14:39:15 -08:00
07aaad0d10
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-01-11 21:00:28 +00:00
b88bee9d48
add interface/method documentatio nto IScriptModuleComms
2010-01-11 17:17:58 +00:00
d86c0d406a
more specific config error logging
2010-01-11 17:15:49 +01:00
19ad68e5e4
Moved MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); around, because it was crashing. Now it crashes elsewhere.
2010-01-11 08:11:04 -08:00
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
001d369568
CommunicationsManager deleted.
2010-01-11 07:45:47 -08:00
9c668558d4
minor: formatting
2010-01-11 15:00:16 +00:00
8452c0869d
Merge branch 'master' into careminster
2010-01-11 08:00:03 +00:00
ff55ae0eb2
Make console_port work.
2010-01-11 07:59:13 +00:00
bfddd75ca8
Refactor. Instantiate sim status handlers in opensim base, not in a plugin
2010-01-11 05:12:01 +00:00
15a11e9745
Refactor. Move MainServer init to a place with greener grass
2010-01-11 05:03:56 +00:00
751e70af78
NetworkServersInfo removed from CommsManager.
2010-01-10 21:37:36 -08:00
dc4bbf6065
All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService.
2010-01-10 20:29:09 -08:00
20e748205e
Merge branch 'master' into careminster
2010-01-11 03:50:24 +00:00
2415d36bed
OpenSim.Region.Communications.* is no more. Thanks to everyone who contributed to these!
2010-01-10 19:50:09 -08:00
0c2946031b
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
2010-01-10 19:42:36 -08:00
e966e51b89
Add a console_port setting to let the rest console use a different port
...
from the region server
2010-01-11 03:29:24 +00:00
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -08:00
649d45a2d4
Merge branch 'master' into careminster
2010-01-11 02:04:58 +00:00
2320b17ca9
Whitespace cleanup
2010-01-11 02:04:05 +00:00
0ae861d7d7
Merge branch 'master' into careminster
2010-01-11 02:01:23 +00:00
a0859754c0
Adds llRotTarget and the events at_rot_target and not_at_rot_target.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-11 02:00:40 +00:00
53e83e5dbb
* Starting to clean the house...
...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
e31131b40f
Some typos fixed related to master avie removal
2010-01-10 15:41:49 -08:00
e3d1d824e1
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-10 15:39:49 -08:00
c0642bf7e0
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-10 15:35:15 -08:00
4dd523b45d
* Changed IPresenceService Logout, so that it takes a position and a lookat
...
* CommsManager.AvatarService rerouted
2010-01-10 15:34:56 -08:00
b5f1857d34
Remove a little bit more if master avatar
2010-01-10 22:55:43 +00:00
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
6998668bbc
* Last reference to CommsManager.UserProfileCacheService removed
...
* Grided-sims added the Library module
2010-01-10 14:12:03 -08:00
511481e8d9
Merge branch 'master' into careminster
2010-01-10 19:59:49 +00:00
2bf49cc1bb
Clean CRs from previous patch
2010-01-10 19:58:44 +00:00
038ec133e6
Adds land collision events.
...
CRs cleaned from patch
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-10 19:58:18 +00:00
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
1676e70dfe
Merge branch 'master' into careminster
2010-01-10 04:16:06 +00:00
45b19e5e2d
Fix a small bug in login disable code
2010-01-10 04:05:19 +00:00
b9e6f4583c
Implement access module commands
2010-01-10 03:48:10 +00:00
b0a7bcb2c8
Add "StartDisabled" to [Startup] to make all regions start up with
...
logins disabled until enabled from the console. Add the AccessModule (WIP)
2010-01-10 03:17:40 +00:00
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
7cb66de2e0
* Moved command reset password from OpenSim to UserAccountService.
2010-01-09 18:16:14 -08:00
96ecdcf9c5
* Added SetPassword to IAuthenticationService.
...
* Added create user command to UserAccountService. Works.
* Deleted create user command from OpenSim.
2010-01-09 18:04:50 -08:00
46b5fe5acd
Merge branch 'master' into careminster
2010-01-09 20:54:59 +00:00
49c09ef24c
Fixes prim to prim collision.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-09 20:47:58 +00:00
28d6705358
Preliminary work on the new default region setting mechanism
2010-01-09 20:46:32 +00:00
25fdbd6cbc
Less refs to UserProfileCacheService. Compiles but likely doesn't run.
2010-01-09 09:09:32 -08:00
089f5403a7
Merge branch 'master' into careminster
2010-01-09 16:35:32 +00:00
bc558788c2
A last fix for estate access by group. One should send the correct list.
2010-01-09 16:32:14 +00:00
1597e33549
Merge branch 'master' into careminster
2010-01-09 15:59:33 +00:00
673a52fa7a
Implement the groups module query to make the estate allowed groups work
2010-01-09 15:58:18 +00:00
121c6b4835
Merge branch 'master' into careminster
2010-01-09 15:34:58 +00:00
332463ca94
Fix up the weird Lindenish "setaccess" message. Talk about strange....
2010-01-09 15:28:52 +00:00
a764eb5dc7
Merge branch 'master' into careminster
2010-01-09 14:21:50 +00:00
063f106cbb
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
...
will be honored now, while allowed groups will not. This requires additional
groups module integration work
2010-01-09 14:17:44 +00:00
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +00:00
6b60f3cce5
A few more inches... Old friends things removed. Less references to UserProfileService.
2010-01-08 20:31:29 -08:00
a2aadb78a9
Maintain control() event stream
2010-01-08 23:12:11 -05:00
c76c80a28a
Adds IClientAPI voids for GroupProposals.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-08 18:27:49 +00:00
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08:00
bba557aff6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-08 05:31:31 +00:00
17efecd6c5
Moving the new group data structures out of LLClientView into GroupData.
...
The new methods are still not in IClientAPI, so some work remains to be done.
2010-01-08 05:29:29 +00:00
452be5e546
Second Fix to the new Packets as per Melanie's request.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-08 05:17:02 +00:00
71adb37fa8
Fix llRotBetween
2010-01-07 23:58:19 -05:00
6591f8a592
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-01-07 23:04:28 -05:00
f11a97f12d
* Finished SimulationServiceConnector
...
* Started rerouting calls to UserService.
* Compiles. May run.
2010-01-07 15:53:55 -08:00
1e899704c1
Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457
2010-01-07 11:28:38 -08:00
b67470af91
Fixes the newly added packets as per Melanie's request.
...
Provisionally applied to fix the naming. Signatures are still subject to change.
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 15:09:13 +00:00
7dd43bef8c
Fixes the Collision errors and adds more to llGetStatus
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 10:14:59 +00:00
a542871c15
Allow estate managers (if estate_owner_is_god is set) to actually enter
...
god mode. Allow god modification of objects if the object owner is the
same god that wants to modify, this allows you to regain perms on your
own objects after IAR import messed them up.
2010-01-05 16:04:57 +00:00
3724a38ab4
Allow estate managers (if estate_owner_is_god is set) to actually enter
...
god mode. Allow god modification of objects if the object owner is the
same god that wants to modify, this allows you to regain perms on your
own objects after IAR import messed them up.
2010-01-05 15:39:53 +00:00
7f960cd595
Merge branch 'master' into presence-refactor
2010-01-04 21:41:33 +00:00
d657b76dba
Merge branch 'master' into careminster
2010-01-04 06:17:38 +00:00
3740775472
When rezzing a no-copy object on a no-rez parcel, the object vanishes from
...
inventory until relog. This patch corrects this and puts the item back into
inventory.
2010-01-04 06:16:04 +00:00
253e2ed699
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-01-03 23:10:01 -05:00
1121919b57
Solve conflict
2010-01-03 22:02:36 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
e69ec1108f
Cause llSetText to send prim updates.
2010-01-03 21:42:22 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
99efa99585
Successfully logged into a grid.
2010-01-03 11:44:57 -08:00
c268e342d1
* Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle.
...
* Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now.
* Completed SimulationServiceConnector and corresponding handlers.
2010-01-03 09:35:12 -08:00
28702f585f
* Avatar service connectors all in place, but untested.
...
* Fixed a typo in RemoteUserAccountServiceConnector module.
2010-01-02 15:07:38 -08:00
71fdc24f5c
Add virtual method StateChange to ScriptBaseClass
2010-01-02 21:21:31 +01:00
9f273717a2
Add virtual method StateChange to ScriptBaseClass
2010-01-02 19:43:54 +00:00
8a9677a531
The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible.
2010-01-01 21:12:46 -08:00
ec53301e63
Forgotten modules in prior commit.
2010-01-01 18:59:54 -08:00
4240f2dec6
New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing.
2010-01-01 16:54:24 -08:00
1387919c20
Yes! First test of new login service done still in 2009! Bombs in auth, because the data migration is missing. Will fix it next year...
...
* HAPPY NEW YEAR!
2009-12-31 20:51:35 -08:00
20318dba05
Finally restire the EMPTY friends module (what a mess)
2010-01-01 02:05:19 +00:00
aa51b83fdc
Merge branch 'master' into careminster
2009-12-31 23:31:45 +00:00
872387d278
Merge branch 'master' into presence-refactor
2009-12-31 23:30:41 +00:00
3ec502f551
Readds llCollisionFilter and adds llPassCollision.
...
Applied with whitespace cleanup
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 23:29:32 +00:00
b321c0a932
Merge branch 'master' into careminster
2009-12-31 21:53:39 +00:00
e6cd7f28de
Readds llCollisionFilter and adds llPassCollision.
...
Applied with whitespace cleanup
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:42:52 +00:00
004c751a1b
Whitespace cleanup (changed hard tabs to 4 spaces)
2009-12-31 21:36:04 +00:00
8ca37dbefa
Adds Friend Finding functionality.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:31:04 +00:00
234d4e1105
Adds tons of packets.
...
Applied with change: Changed spelling to Summary (from Summery)
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:24:56 +00:00
3f901d313b
Vehicle Linear parameter adjustments
2009-12-31 16:07:36 -05:00
a8901a40f4
Simulation handlers (agents & objects) completed.
2009-12-31 09:25:16 -08:00
67cfe34e67
Merge branch 'master' into careminster
2009-12-31 06:42:33 +00:00
9c4e6f060a
This patch caused serialization errors and needs to be reexamined
...
Revert "[PATCH] Adds llCollisionFilter"
This reverts commit eab2b4c6a9
2009-12-31 06:41:10 +00:00
c664307126
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-30 21:00:52 -08:00
b29ae72460
First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
2009-12-30 21:00:16 -08:00
643cc7a0ee
Merge branch 'master' into careminster
2009-12-31 04:53:05 +00:00
b3cb99036c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-31 06:21:03 +01:00
9602227eb6
Add a small delay in NewAgentConnection to fix an issue with Hippo
...
(and possibly other cleints) getting their data mixed up.
2009-12-31 06:20:35 +01:00
eab2b4c6a9
[PATCH] Adds llCollisionFilter
...
Thank you, Revolution. Applied with minor changes.
2009-12-31 04:48:59 +00:00
87959464c9
Adds osKickUser and osSetSpeed
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 03:56:55 +00:00
3507005d9d
Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount.
...
Implement the fetch operations fully. Rename one last UserService file to
UserAccountService
2009-12-31 01:16:16 +00:00
a21ce9151b
Merge branch 'master' into presence-refactor
2009-12-30 22:24:14 +00:00
1d2a332b96
Unit tests for presence. They helped fix a couple of wrongnesses.
2009-12-30 14:17:18 -08:00
e6c71d6df6
* Fixes Sitting on the ground.
2009-12-30 15:55:49 -05:00
5e103f2b2e
Revert "Merge branch 'master' into careminster"
...
This reverts commit d49d44923d
2009-12-30 20:26:22 +00:00
d49d44923d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:25:57 +00:00
cbe0841bc9
Revert "Merge branch 'master' into careminster"
...
This reverts commit 596af3f600
2009-12-30 20:13:18 +00:00
596af3f600
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:12:21 +00:00
16a64c400b
* Makes forward and backward key reactions faster by responding to the NUDGE type movements.
2009-12-30 15:01:14 -05:00
2205d1c486
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-29 22:00:01 -05:00
25544ac04a
* Attempts to resolve the megaregion terrain edit rebound.
...
* It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue)
* While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good.
* This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good.
2009-12-29 21:59:19 -05:00
8f0d6d6b5c
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:37:28 +00:00
917fad40da
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:54 +00:00
6a4c578e5e
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:16 +00:00
88d2df597e
* Fixed names.
...
* Added configs for Standalone
* Changed UserSericeBase to use useraccounts instead of user
2009-12-29 16:34:02 -08:00
81bcedda83
Renamed user account modules to be consistent
2009-12-29 16:06:21 -08:00
b4483df270
* All modules and connectors for user account service are in place. Untested.
...
* Cleaned up a few things on presence connectors
2009-12-29 15:58:40 -08:00
a08360e3cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-30 00:27:34 +01:00
06f639b8f3
Fix a timer list locking issue causing XMREngine deadlocks
2009-12-30 00:27:01 +01:00
67cfac0cf1
Merge branch 'master' into careminster
2009-12-29 18:41:45 +00:00
0b5cdc539c
Change teleports so the TeleportFlags are sent to the destination sim. It
...
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
2009-12-29 18:35:06 +00:00
e0fc854f05
Adding new fields and home location methid to presence. Adding cleanup
...
(deleting all but one presence record) on logout so that they don't pile up.
2009-12-28 23:42:08 +00:00
43691e8270
Added some more log messages. This is beginning to work.
2009-12-28 11:46:34 -08:00
92a40129b5
Database and presence changes. Untested
2009-12-28 17:34:42 +00:00
f43a648052
* Added the new modules to Resources, making them active.
...
* Added their configs to standalone for testing. This crashes, because the DB is still not ready.
2009-12-28 09:22:35 -08:00
531f998ed2
* Deleted HGPresenceBroker, since it won't be needed
...
* Linked the remote presence module to the corresponding remote connector
2009-12-28 07:16:43 -08:00
42122388ef
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 20:35:05 -08:00
3ef513e863
Presence remote connector and handler. Presence HG Broker. Nothing tested, just compiles.
2009-12-27 20:34:42 -08:00
3a953dfc98
This is somewhat major-like..... Change the intialization order of
...
Application plugins so that MainServer.Instance gets assigned before
RegionModulesController loads the new style shared modules. This
is needed because otherwise no new style shared module could
register a HTTP method.... if it breaks, you get to keep both pieces
2009-12-28 01:56:30 +00:00
eebddcd5e6
Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells.
2009-12-28 01:24:15 +00:00
b8dfccb227
Changed GetAgents to take string[] instead of UUID[]
2009-12-27 16:07:16 -08:00
aa45262c3c
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:47:18 -08:00
49d6cfad2b
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:40:43 -08:00
2248d2ff32
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:38:44 -08:00
ad8ee18090
First pass at the local connector for presence. No cache yet. Just the connector to the local service and a presence detector object.
2009-12-27 08:38:05 -08:00
bca2afdb3c
One should not copy/paste so much :)
2009-12-27 16:08:12 +00:00
045a44b1af
One should not copy/paste so much :)
2009-12-27 16:07:59 +00:00
26599e0906
One should not copy/paste so much :)
2009-12-27 16:07:13 +00:00
d321d23afe
Fix the spelling :/
2009-12-27 16:03:00 +00:00
3ec8e8e40b
Fix the spelling :/
2009-12-27 16:02:31 +00:00
ec4d639a28
Fix the spelling :/
2009-12-27 16:01:36 +00:00
e3f60ce06f
Merge branch 'master' into careminster
2009-12-27 15:48:43 +00:00
e063f0d592
Encode the published and mature checkboxes into the user flags for
...
profiles
2009-12-27 15:47:14 +00:00
19a5e606b3
Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ReaderWriteLockSlim, hopefully fixes a native crash
2009-12-27 07:08:16 +01:00
a6c93ce875
Make sure that we're not bounds checking attachments. 'Cos otherwise your hair will end up on your bum. Seen that before?
2009-12-26 22:55:18 +01:00
1b8f91a0db
Merge branch 'master' into casper
2009-12-26 18:17:55 +01:00
7371c7662a
Fix for landing points. Only one scenario is not fully covered by this change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
2009-12-26 18:14:12 +01:00
f3a4860635
Merge branch 'master' into careminster
2009-12-26 04:13:27 +00:00
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
e881f35fbb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-25 23:20:08 +00:00
59a841d69c
Merge branch 'master' into careminster
2009-12-25 23:17:08 +00:00
d5618fbcc3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-25 23:10:44 +00:00
8d36d7beed
Enable the profile module to be replaced completely, even for the base
...
profile data
2009-12-25 23:10:07 +00:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
7a06ab834d
Clear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParams() - addresses Mantis #4462
2009-12-24 11:00:08 -08:00
0054afd39b
Merge branch 'master' into careminster
2009-12-24 16:45:27 +00:00
7f699fca9a
Add the body to the LSL List Size property
2009-12-24 18:18:14 +01:00
0ce3d4b0a9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-24 16:44:47 +00:00
86a429bc44
Add the LSL List Size property
2009-12-24 16:44:12 +00:00
2c3d7972b9
No-op in this commit. Just increasing the tag number due to weirdnesses.
2009-12-23 19:43:50 -08:00
1fa938aab0
Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones.
2009-12-23 17:31:30 -08:00
908992a105
Fixes the broken build of the previous commit.
2009-12-23 17:10:37 -08:00
e5e951d92c
Merge branch 'master' into careminster
2009-12-24 00:45:53 +00:00
5a653ef96f
Merge branch 'master' into careminster
2009-12-23 23:10:34 +00:00
53386b6f1f
Add saving assets from gestures to IAR
2009-12-23 23:09:41 +00:00
165f193f78
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-23 21:25:08 +00:00
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +00:00
f2d2073f2b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-23 21:21:22 +00:00
c05a35cc71
Fix a bounds exception I came across in IAR restore
2009-12-23 21:20:48 +00:00
fddefff284
Thank you kindly, Ziah for a patch that adds the channel to the class ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts.
...
Signed-off-by: Charles Krinke <cfk@pacbell.net>
2009-12-23 10:34:11 -08:00
a9f4d7a29c
Add a debugger tag to stop Visual Studio from breaking
2009-12-23 17:34:08 +01:00
c54e0953d0
Merge branch 'master' of ssh://TOR/var/git/careminster
2009-12-23 14:15:27 +01:00
b575bf2524
Added some null reference and deleted group checks to certain functions to fix region crash scenarios.
2009-12-23 14:14:20 +01:00
f45a69821b
Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the stream can be closed.
2009-12-22 21:00:46 -08:00
30f59370d3
Merge branch 'master' into careminster
2009-12-22 15:48:41 +00:00
c11f259e15
Remove GetState. It is really unused and was reinstated by the revert
2009-12-22 15:46:55 +00:00
a24d9bff03
Revert "Remove an insterface member that was never used"
...
It was used. By the API, which is dynamically loaded. So it didn't complain
until it hit Bamboo
This reverts commit 33d5018e94
2009-12-22 15:45:56 +00:00
73491cceed
Merge branch 'master' into careminster
2009-12-22 15:37:24 +00:00
33d5018e94
Remove an insterface member that was never used
2009-12-22 15:35:39 +00:00
28c7bb99bf
Merge branch 'master' into careminster
2009-12-22 09:30:50 +00:00
1876ce90af
FINALLY! Script compile errors now appear in the script error pane,
...
not in a funky debug window.
2009-12-22 09:24:01 +00:00
11c4a2cfd0
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-22 00:34:06 -05:00
93b930b937
Fix conflicts
2009-12-22 00:33:31 -05:00
b53b871669
Add a data path for error messages
2009-12-22 06:25:32 +01:00
0a29842caf
Include ChOdePlugin
2009-12-22 00:20:04 -05:00
05e8b4e72c
Add a data path for error messages
...
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-22 04:55:43 +00:00
49fbe0ddb4
Should not commit without compiling
2009-12-22 03:26:47 +01:00
46fea74726
Jumped the gun...
2009-12-22 03:25:09 +01:00
69b551c516
Allow 100ms for scripts to run attach(NULL_KEY) on detach
2009-12-22 03:22:33 +01:00
fa0621b486
Merge branch 'master' into careminster
2009-12-22 00:41:56 +00:00
e530180c1e
Glue code for a couple of new LSL function implementations
2009-12-22 00:26:12 +00:00
84a1a0a729
Merge branch 'master' into careminster
2009-12-21 22:07:22 +00:00
32904c0ce8
When a script has been loaded, remove it's state entry, so recompiling
...
doesn't pick up the old state again.
2009-12-21 22:05:43 +00:00
51ecdf0148
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 15:48:46 +00:00
d04f6688e4
Fixes some incorrect values returned by llGetPrimitiveParams() and osGetLinkPrimitiveParams().
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-21 15:48:30 +00:00
641a789bbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 07:46:33 -08:00
68187f7245
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
2009-12-21 07:44:17 -08:00
b891291135
Merge branch 'master' into careminster
2009-12-21 15:02:57 +00:00
de59910758
Patch from Ziah.
...
Mantis #4456 : Patch to implement some minor MRM Functions : SitTarget,
SitTargetText, TouchText and Text
2009-12-21 14:46:07 +00:00
d8d6e8a304
Merge branch 'master' into casper
2009-12-21 13:29:48 +01:00
e3c1466047
Fixed a nasty crash in StandUp() that occurred when the part got killed with an avatar sitting on it.
2009-12-21 13:22:52 +01:00
df30b1c832
Merge branch 'master' into careminster
2009-12-21 10:28:50 +00:00
27453890d5
Script State Fix: Part 2
...
Change the reader to wrap old-style definitions in new style wrappers.
Change importer to not check irrelevant data that can't be reconstructed
This removes the last bit of knowledge of XEngine's .state files from core.
2009-12-21 10:26:52 +00:00
83d8ba5775
Remove extra checking on the itemID of saved state, since it changes during
...
rez from inventory.
2009-12-21 06:41:10 +00:00
f6ef487413
Script State Fix: Step 1
...
Add Engine=xxx attribute and check for it's presence. Ignore state data
written bby another engine
2009-12-21 06:29:23 +00:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
37b07aa9ec
Fix a case where an idle sim can eat 100% of a core
2009-12-20 16:44:31 +00:00
c7a457f9ee
Merge branch 'casper'
2009-12-20 16:20:48 +01:00
31bf25d05e
Reverted my changes to jhurliman's packet stack since it currently causes more problems than it resolves. The stack DOES need a rework particularly with regards to priorities, but this is not it.
2009-12-20 16:18:43 +01:00
eecaa3d9dd
Merge branch 'tests'
2009-12-19 20:00:00 -05:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
26e3a8ee4b
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
...
* Removed unnecessary debug messages.
2009-12-19 10:16:07 -08:00
6dbe25360e
Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.
2009-12-17 18:40:34 +01:00
6483470ec5
Fix GetWorldRotation(), and a host of related Sit fixes.
2009-12-17 02:54:02 -05:00
83fad75e22
Merge branch 'tests'
2009-12-16 18:59:46 -05:00
9485f17bf9
random drive-by minor math optimization. No need for concern, bitshed was within acceptable limits
2009-12-15 19:12:24 -08:00
7cd44c1a81
Fix prim linking bug, Manis #14
2009-12-15 20:04:53 -05:00
6bd087a8f9
minor: remove some mono compiler warnings
2009-12-15 16:42:42 +00:00
f8b6bc8d11
Merge branch 'master' into careminster
2009-12-15 15:46:18 +00:00
0f616d2ffe
Prevent OSSL from crashing if the sim was loaded from a remote config and
...
osGetGridName, osGetGridNick or osGetGridLoginURI is used.
2009-12-15 15:42:51 +00:00
0020afaf67
Merge branch 'master' into tests
2009-12-15 06:01:59 -05:00
b8b4517211
Removed excessive call to UpdateMovementAnimations which prevented GroundSit; Corrected cause of 'sit on roof'.
2009-12-15 01:49:23 -05:00
9e54e61a43
Make the HG map search recognize host names without ports.
2009-12-14 08:27:16 -08:00
824d7190c2
Merge branch 'master' into careminster
2009-12-14 00:40:56 +00:00
0813dc8c1d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-14 00:32:00 +00:00
c426549f53
Add an option to exit an instance rather than restarting a region within it
2009-12-14 00:31:15 +00:00
f046457249
Tweaking the ModifyLand packet to be async. Advice from Adam
2009-12-13 04:02:18 -05:00
4ef8dc7d96
* Add some glue that allows LocalPacketHandlers to decide if they want the packet to be processed asynchronously or not.
...
* Make several packets not asynchronous (such as AgentUpdate). In theory, all fast returning packet handling methods should not be asynchronous. Ones that wait on an external resource or a long held lock, should be asynchronous.
2009-12-13 02:08:28 -05:00
87e89efbf9
* Mistaken ThreatLevel classification on osGetSimulatorMemory - should have been MODERATE.
2009-12-13 03:49:22 +11:00
963cf25813
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
...
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
b056c243e4
Commit partial work because of repo change
2009-12-12 10:12:59 -05:00
b310efc50f
Merge branch 'master' into careminster
2009-12-12 12:54:43 +00:00
0639e90f56
* Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."
...
* Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
2009-12-12 02:41:59 -05:00
35961caec6
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-12 01:24:25 -05:00
0fdf883cbd
Merge branch 'master' into careminster
2009-12-12 04:56:28 +00:00
d89f3e9811
Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:44:32 +00:00
1382dc976c
Merge branch 'master' into careminster
2009-12-12 04:14:47 +00:00
81debdfebe
A few more guards along the path to user server.
2009-12-11 20:20:18 -08:00
4bbe9a51ac
Added an image uuid to objects marked "Show in search". Only works for boxes.
2009-12-11 09:09:36 -08:00
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
a6a6bf007a
Move osFunctions into a new Careminster script interface
2009-12-09 23:28:00 +01:00
2a6dbd068e
Last bits and bobs to clean up the Meta7WindlightModule
2009-12-09 03:58:56 +01:00
e3f229225c
Enable scripting interface for windlight
2009-12-09 01:34:26 +01:00
2f8b9cbf2b
* Commit some sit code that's commented out for now.
2009-12-08 11:28:13 -05:00
ee9d46c825
Correct AbsolutePosition calculation
2009-12-08 05:49:05 +01:00
dbd8c400ce
Merge branch 'careminster' into windlight
2009-12-07 18:14:02 +01:00
29a740ec8c
Initial windlight codebase commit
2009-12-07 18:05:40 +01:00
dd5696e8bd
Same for the remote auth connector
2009-12-07 14:31:55 +00:00
c2d3afdeee
Same for the remote auth connector
2009-12-07 14:31:20 +00:00
9155c9ee37
Merge branch 'master' into careminster
2009-12-07 14:14:00 +00:00
0d1d437bd3
Fix linked physical daughter prim position update.
2009-12-06 21:11:59 +01:00
172e2f4e76
Fix to existing ReaderWriterLockSlim implementations
2009-12-06 17:23:07 +01:00
4c61fcfc40
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
1e222d52e6
Change EntityManager to use RWlocks
2009-12-06 03:56:15 +00:00
f9ae9afaac
Fix build break from conflicted merge
2009-12-06 03:10:34 +00:00
09bbfc1d56
Merge branch 'master' into careminster
2009-12-06 03:01:58 +00:00
a44749b9d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-06 02:54:47 +00:00
8d196dbd14
* Adds Normal to the fields returned by the Physics Raycaster
...
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
2009-12-05 22:18:00 -05:00
9453c42631
Experimental: Remove explicit property sends
2009-12-06 02:54:19 +00:00
1a695875a7
Skip single prims in unlink selections
2009-12-06 02:54:09 +00:00
f71025aeed
Change locking to not mix explicit Monitor.* calls with lock()
2009-12-06 02:54:00 +00:00
5259a32319
Remove extra forced updates. They're not needed for each prim. Really.
2009-12-06 02:53:50 +00:00
46d5add175
Lock updates out while linking and unlinking
2009-12-06 02:53:42 +00:00
e3a22ff37d
Eliminate multiple updates on link/unlink
2009-12-06 02:53:34 +00:00
f8cc409034
Cause better packing of ObjectProperties
2009-12-06 02:53:24 +00:00
79511ecce2
Experimental: Remove explicit property sends
2009-12-06 02:15:52 +00:00
2fe75a62be
Skip single prims in unlink selections
2009-12-06 02:00:32 +00:00
da414fd509
Change locking to not mix explicit Monitor.* calls with lock()
2009-12-06 01:20:39 +00:00
f2891e7738
Remove extra forced updates. They're not needed for each prim. Really.
2009-12-06 00:50:28 +00:00
fbefa8273b
Lock updates out while linking and unlinking
2009-12-06 00:25:04 +00:00
ceccfe02d0
Eliminate multiple updates on link/unlink
2009-12-06 00:02:24 +00:00
129de26032
Cause better packing of ObjectProperties
2009-12-05 23:25:30 +00:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
c4b6010fb3
* Fixes mantis 4416. Animator is dereferenced on logout
2009-12-05 13:01:21 -05:00
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
c0f3a4c833
Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin
...
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
2009-12-04 18:26:58 +00:00
781db43a76
* Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
...
* Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
2009-12-03 20:21:10 -05:00
d9a20edfb0
* Move code from that last commit to LLClientView since it's a linden client specific limitation, it moves to the Linden Specific client handler.
2009-12-03 02:02:04 -05:00
af04cd1ae0
* If the position that comes in on Scene.SetHomeRezPoint has a component that is 255.5, replace the component with the user's position in the simulator.
...
* Fixes mantis 4414: http://opensimulator.org/mantis/view.php?id=4414
2009-12-03 01:50:54 -05:00
f7b2f0e61e
Add position and region of prim items with missing assets in log reports
2009-12-02 18:15:33 +00:00
30fe88b808
* Terrain uploads via the Estate Tools now support a multitude of file formats. Specifically: . bmp, .raw, .r32 & .r64. (in ascending order of precision)
...
* It uses file length as the detection routine (as each of these formats has a distinct size in bytes for a 256x256 array.) - more formats should be possible to add.
2009-12-03 02:44:12 +11:00
551696bb45
Merge branch 'master' into careminster
2009-12-02 10:22:21 +00:00
5ee79c62bf
Change default destination of deleted items to the trash folder. Everything
...
else still goes to L&F
2009-12-02 10:21:24 +00:00
ded16d3529
Merge branch 'master' into careminster
2009-12-02 00:36:53 +00:00
d2c1610d17
* Test Autoconvert line ending on my repo..
2009-12-01 11:35:32 -05:00
75e28b3a16
* Fix Inconsistent line ending style on Scene
2009-12-01 10:48:11 -05:00
7a2e8cb05f
* Fix Inconsistent line ending style on ScenePresenceAnimator
2009-12-01 10:47:18 -05:00
56dca3b5a4
* Fix Inconsistent line ending style on SimStatsReporter
2009-12-01 10:45:36 -05:00
d4073d9bd5
* Fix Inconsistent line ending style in LLUDPClient
2009-12-01 10:19:39 -05:00
475d23741d
* Fix Inconsistent line ending style in ScenePresence
2009-12-01 10:17:17 -05:00
2e6dce434f
Enforce physical prim max size on single prims.
...
Also convert a lock() to ReaderWriterLockSlim that i missed in the last commit
2009-11-30 21:52:55 +01:00
9888f95068
Convert multiple lock()s which directly hinder script performance in linksets to ReaderWriterLockSlim.
2009-11-30 21:17:15 +01:00
83694e5578
* Add a close method to the ScenePresenceAnimator that dereferences the class variables and make the ScenePresence Close method call it.
2009-11-30 14:03:20 -05:00
0cb4ff1b68
* Modified ScenePresence to use the Util version of the EnvironmentTickCount method (and it's subtract method). Remove redundant EnvironmentTickCount definitions in ScenePresence.
2009-11-30 13:53:43 -05:00
8bbb88ea4e
Merge branch 'master' into careminster
2009-11-30 14:16:42 +00:00
5b0bb1eff9
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
2009-11-30 01:09:46 -08:00
e987e85c0c
add agent position to output of "show users" console command
2009-11-30 01:09:03 -08:00
69d83e1548
Merge branch 'master' into careminster
2009-11-30 08:25:40 +00:00
4338f4e1d7
* Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
...
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
9fd9211a38
Add some conditionals to references to the WorldComm module, so that the
...
module can be disabled without crashing the sim
2009-11-28 09:23:26 +00:00
e7333515d9
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-27 19:17:54 -05:00
8296413add
* Re-enable lightweight packet tracking stats on a 3000 ms interval.
2009-11-27 19:17:36 -05:00
66f511c76a
Remove unused GetDefaultAppearance() static function that is also available on AvatarFactoryModule
2009-11-27 19:45:33 +00:00
e5661e5609
Remove stub Python module and DLLs since this was never fully implemented
...
It may be possible to reintroduce this if someone wants to implement a Python hookup for OpenSim scripting (I'm sure it can't be too hard).
Might be possible to import wholesale from modrex
See http://opensimulator.org/mantis/view.php?id=4395
Thanks mpallari
2009-11-27 19:31:19 +00:00
55a0896918
minor: remove mono compiler warning
2009-11-27 19:28:26 +00:00
e078fb2e71
Implement god mode user freezing and unfreezing
...
See http://opensimulator.org/mantis/view.php?id=4356
Thanks Revolution
I performed a subsequent probable bug fix in this patch
2009-11-27 19:23:51 +00:00
2e47e51475
Make locking of timers and listeners in script related functions consistent
...
See http://opensimulator.org/mantis/view.php?id=4316
Thanks KittyLiu!
2009-11-27 19:01:45 +00:00
25e2b16451
Apply patch to stop failure of llParcelMediaCommandList() on group deeded land
...
See http://opensimulator.org/mantis/view.php?id=3999
2009-11-27 17:52:23 +00:00
32ef1b9e23
remove stringent content type checking to make it easier to load oars directly from urls
2009-11-27 15:10:12 +00:00
1f71523a5a
minor: make irc bridge logging less verbose if it isn't actually enabled
2009-11-27 14:47:49 +00:00
b9eb244d6d
Reset update flag when a SOG is deleted. This fixes llDie();
2009-11-27 08:59:03 +00:00
aa695e92f7
Reset update flag when a SOG is deleted. This fixes llDie();
2009-11-27 08:58:26 +00:00
0ddd1ce0b7
Merge branch 'master' into careminster
2009-11-27 08:18:16 +00:00
3ae3cd0a5b
Make llDie virtual, since it's functionality is engine specific
2009-11-27 08:16:47 +00:00
cc18ab12f8
Merge branch 'master' into careminster
2009-11-27 00:40:56 +00:00
f84da8e642
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-26 17:03:19 -05:00
e2200026ca
* Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't.
2009-11-26 17:03:00 -05:00
2c3f6aaa87
Merge branch 'careminster' into tests
2009-11-26 20:41:38 +01:00
5dedacca3c
First attempt at mult-sit on large single prims.
2009-11-26 20:37:08 +01:00
ed148eba32
Merge branch 'master' into careminster
2009-11-26 17:45:09 +00:00
9d05962029
Added osGetRegionStats() function, to return a number of sim statistics
2009-11-26 17:43:17 +00:00
d39c300d11
Added osGetRegionStats() function, to return a number of sim statistics
2009-11-26 17:43:00 +00:00
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
c6bfecccaa
Fix a small bug. Trusted script crossings now work again
2009-11-26 17:16:22 +00:00
41226dc991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-26 17:05:48 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
ee0b5abc62
minor: reduce region ready logging verbosity
2009-11-26 16:51:10 +00:00
2bc19a1e23
Resolve issue where an iar load fails to preserve original item creators
...
See http://opensimulator.org/mantis/view.php?id=4394
This change preserves the uuid when a profile is found rather than the ospa
2009-11-26 16:39:30 +00:00
a27d33cb63
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 13:13:56 +00:00
22c325aa5a
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 13:13:48 +00:00
ac2fcbe224
Improvements to rAdmin admin_shutdown and admin_restart. Both methods can now accept a parameter of noticetype = dialog in order to display a blue persistant dropdown instead of a short notice. Added an optional and configurable delay to the restart method, defaulting at 30 seconds as before. Both methods can also accept a noticetype = none dialog in order to act silently.
2009-11-26 15:17:44 +01:00
05fc504ff3
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 12:16:42 +00:00
88842edc95
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 12:08:20 +00:00
a5f2803c79
* Re-enable the AbsolutePosition = AbsolutePosition in the LSL_Api in the SetRot method if the object is not active physical. This is important for scripted rotating doors. without AbsolutePosition = AbsolutePosition, the door won't rotate. It's also important that we do not use AbsolutePosition = AbsolutePosition if the object is active physical because that would cause a complete rebuild of the object which would break vehicles. This is the best of both worlds right now. Doors as child prim should work again so long as you don't check the Physical box.
...
* Thanks talentraspel
* Thanks NixNerd
* Thanks KittoFlora
* Thanks lockd
2009-11-26 01:34:46 -05:00
63b6b9cdce
Added animation support for my last commit
2009-11-26 02:35:27 +01:00
de55110247
Merge branch 'careminster' into casper
2009-11-26 02:01:51 +01:00
b9d22aa821
Add nudge right and left to avatar movement (faster reaction times when stepping left or right.)
2009-11-26 01:59:08 +01:00
de927adf27
Add the dummy "Size" property to the list type
2009-11-25 20:01:21 +00:00
dac9c6fb23
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-25 14:13:51 -05:00
a3755d831d
Patch: Fix a bug in LAND animation when the TickCount wraps into negative numbers
...
by Mic Bowman
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-11-25 14:13:29 -05:00
79395bc7db
Merge branch 'master' into careminster
2009-11-25 17:04:05 +00:00
cc3617f74f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-25 17:03:11 +00:00
59caa68e08
minor: add doc to a few parcel methods
2009-11-25 17:49:38 +00:00
0b380f68d8
Change osTeleportAgent parameters from long to int. That numerical range is
...
not even supported by the underlying type, so there is no need to ask
for a type the script can not even supply.
2009-11-25 17:02:45 +00:00
c81f37cf82
Change osTeleportAgent parameters from long to int. That numerical range is
...
not even supported by the underlying type, so there is no need to ask
for a type the script can not even supply.
2009-11-25 17:01:41 +00:00
40464f6cc6
Change chat config code so that enabled = false actually does disable the chat module
2009-11-25 16:23:37 +00:00
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
c18422ad3a
Implement oar merging
...
An oar can now be merged with existing region contents by using the --merge option
For example, load oar --merge my.oar
Existing terrain, region settings and parcel data is left in place when an oar is merged.
See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information
2009-11-25 16:02:47 +00:00
f9807884a4
Add MIT/X11 licensed NDesk.Options ( http://www.ndesk.org/Options ) DLL to aid command line parsing
2009-11-25 15:28:43 +00:00
a642968fd5
* Reverting last commit.. because it just made it worse.
2009-11-25 04:00:52 -05:00
25b4160434
Merge branch 'master' into careminster
2009-11-25 08:45:41 +00:00
abddb60b8d
* Attempt number 1 to stop the repeating crouch animation that sometimes happens.
...
* This tries to address it by correcting one potential bug where it never resets the falltimer.
* This tries to address it by telling Physics that we're not flying this step.. instead of waiting until the next step when the next agent update comes along.
2009-11-25 02:51:11 -05:00
32c464ad1f
Fixed animation sequencing: SitHere, Falling, Stand/Walk etc. Login Init
...
Av Animation at Stand.
2009-11-25 08:03:09 +01:00
d5aceb6d95
Append a prefix to the god avatar names appearing in chat whilst in god mode (disabled by default, config entry admin_prefix)
2009-11-24 23:33:12 +01:00
f605d59136
Make load/save iar slightly better in the face of io failures by always attempting to close the streams
2009-11-24 18:27:31 +00:00
c083ab6824
make save and load oar slightly more robust by always closing the archive streams even if there has been an error
2009-11-24 17:47:09 +00:00
73dcbbd57a
minor: remove some mono compiler warnings
2009-11-24 17:32:14 +00:00
88ead9ee63
pass all command parameters to load/save oar, not just the filename
...
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
81f7e9b462
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-24 16:00:45 +00:00
8383bde768
Removed some extra debug chatter
2009-11-24 18:18:19 +01:00
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
cad2bf5b08
Merge branch 'master' into careminster
2009-11-24 16:00:35 +00:00
52952a75ca
minor: remove experimental tags from load iar and save iar commands
2009-11-24 15:20:02 +00:00
cf36420d19
* This concludes the packet migrations from the big nasty switch into packet handler delegates.
2009-11-23 22:20:51 -05:00
3bfbd2952d
* Moved 60 more packet handlers to Packet Handler Delegates.
2009-11-23 20:19:00 -05:00
247c66b3fe
Swap the locking of m_EventQueue and m_Script to ease locks on script inventory operations
2009-11-23 20:25:53 +01:00
73c2162ff6
Fixed nullrefs
2009-11-23 19:51:40 +01:00
889ce36afa
Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbortException() to ease debugging on Visual Studio
2009-11-23 17:59:24 +01:00
3ebb528c79
* Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390
2009-11-23 11:44:22 -05:00
976728029b
* Moved 40 more Packet handlers to the PacketDelegate and out of the 5000 line switch.
2009-11-23 01:12:46 -05:00
31827b0286
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-23 04:26:42 +00:00
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00:00
94cb4b486a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-22 22:05:26 -05:00
21f80b6507
* Adds a test for if the collision is at the bottom of the capsule on avatar. This prevents the 'double jump' capability that's been occurring for ages when avatar collide with prim on the side.
2009-11-22 22:04:52 -05:00
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
9ba10af6b2
* Added missing lock to m_forcelist when AddForce is called. When a user dragged a prim, in some cases, it would corrupt the datatype in memory and throw spurious IndexOutOfRangeExceptions.
...
* Physics a situation that causes physics to spew redline messages to the console forever.
2009-11-22 21:08:54 -05:00
0ff3c28f90
* This doesn't fix mantis 3522, but it should mitigate it.
...
* If the start position is outside of the region on the X and Y, put the user in the center of the region and then damp the Z position at 720 if necessary. If the start position is not outside of the region on the X or Y, then don't check the Z.
2009-11-22 20:21:33 -05:00
c155099faf
* The client prevents the avatar from landing if the avatar is going above an unknown certain speed, so, add a speed check on the server.
...
* This addresses the 'hump the prim' animation playing while you're moving forward full speed and pressing page down over a prim to land.
2009-11-22 19:26:00 -05:00
8db97f7dab
* Switched over 15 more packet types from the 5000 line switch to the Packet handler delegate
2009-11-22 05:13:50 -05:00
968b7310f4
* Moved 13 more packet type handlers to PacketHandler Delegates.. and out of of that giant 5000 line switch, ProcessInPacket.
2009-11-22 03:48:56 -05:00
03df03b269
Merge branch 'master' into careminster
2009-11-22 08:37:07 +00:00
f1522e6204
Add non-scripted sit, fix scripted sit.
2009-11-22 08:31:35 +01:00
87bce90086
Merge branch 'master' into careminster
2009-11-22 03:14:21 +00:00
2c8fbc15e8
* Comment out some example code for later.
2009-11-21 21:59:31 -05:00
079691b98f
* Move a few of the ProcessInPacket switch case blocks into packet handler delegates
2009-11-21 21:58:11 -05:00
f7916d10f3
* This fixes landing on Prim and removes the hack from yesterday. Landing on prim should work fine again.
2009-11-21 19:38:38 -05:00
4a29a7f92c
Minor packet ordering fix
2009-11-21 16:51:08 +00:00
0149265ee8
Improved avatar responsiveness.
2009-11-21 16:50:33 +00:00
0844e5951c
Merge branch 'master' into careminster
2009-11-21 16:00:18 +00:00
247fc00ce7
* Hack to get avatar to land on prim. This is a big nasty hack that tricks the client into thinking you're landing on the terrain. There are some visual artifacts when you land. It's only temporary until we figure out how this broke.
2009-11-21 06:39:28 -05:00
7760da1a4c
* Fixes the second of two terse update issues. Physical objects should react normally again.
2009-11-21 04:39:41 -05:00
0ffda7128e
* Fixes one of two terse update issues. There's still one left, but this one fixes the situation where the object on the server is moving but no updates are being sent.
2009-11-21 04:33:34 -05:00
8f0db68424
Fix http://opensimulator.org/mantis/view.php?id=3874 - parenthesis in for statements cause script compile failures
...
This fixes a problem in OpenSim where statements of the form
for ((i = 0); (i < 10); (++i)) { ... }
do not compile even though they are valid lsl.
2009-11-20 18:39:39 +00:00
251d1b8fbb
Merge branch 'careminster' into tests
2009-11-19 20:20:03 +01:00
7f0f5060ec
Clean up messages in ODE
2009-11-19 20:13:26 +01:00
d179f2cce9
Merge branch 'master' into careminster
2009-11-19 17:53:34 +00:00
622003ab09
minor: tweak log message to say which region is being enabled for logins
2009-11-18 20:27:37 +00:00
5d0778014d
Merge branch 'master' into careminster
2009-11-18 06:20:21 +00:00
4baac71a5e
refactor: Eliminate redundant CreateSceneViewer call on ScenePresence constructors since this is also done on other called constructors
2009-11-17 18:44:57 +00:00
710a2afd12
Add scene animator set up to apparantly uncalled no-arg ScenePresence constructor
2009-11-17 16:40:59 +00:00
da255be05a
refactor: move AvatarAnimations, BinBVHAnimation
2009-11-17 16:25:52 +00:00
de054bc583
minor: remove mono compiler warning due to unreachable code in GroupsModule
2009-11-17 15:21:29 +00:00
61c76d1810
refactor: move AnimationSet
2009-11-17 15:20:02 +00:00
1324082b90
refactor: move most animation methods from ScenePresence into a new ScenePresenceAnimator class
2009-11-17 15:05:40 +00:00
2606bf4a53
minor: very minor formatting change
2009-11-16 19:16:24 +00:00
4c10826caa
Fix merge conflicts
2009-11-16 02:12:56 +01:00
873c9098d8
Merge branch 'careminster' into tests
2009-11-16 01:40:15 +01:00
b9546d12f2
Change land packet sending back to what the careminster release used
...
to use, remove the silly spiral stuff. Revert to double packets for
improved user experience
2009-11-15 21:20:42 +00:00
b7f1fc116e
Prevent a nullref if a recipient of a group message gas left the scene
2009-11-15 20:21:46 +00:00
28aa8010b2
- Lower TIME_MS_TOLERANCE to 200ms - Allow m_updateFlag to be reset to 0 in the event of a terse update being rejected - Re-add a synchronous SendTo for certain types of packets
2009-11-15 19:40:58 +00:00
d5c18f6149
Make GroupRootUpdate be a terse update. This method is not used by opensim (it should), but it's used by external modules.
2009-11-14 14:14:08 -08:00
2e24415077
undo previous changes
...
add a GetGroupByPrim() method to Scene.cs
delete a redundant method
2009-11-13 22:13:40 -08:00
e7d0aa75ba
expose SceneGraph.GetGroupByPrim(UUID)
2009-11-13 20:52:03 -08:00
96be5e5a88
minor: A further minor tweak to reduce iar load logging verbosity
2009-11-13 20:24:45 +00:00
fe82471c2b
Apply patch http://opensimulator.org/mantis/view.php?id=4369
...
Adds osGetMapTexture() and osGetRegionMapTexture() methods to retrieve region map texture uuids
2009-11-12 19:42:35 +00:00
e2b1fb8ff9
refactor: extract another test asset helper method
2009-11-12 19:15:08 +00:00
ed1089d892
refactor some test asset creation into a helper class
...
remove mono compiler warning
2009-11-12 19:08:00 +00:00
2f092d271e
Rename test services to mock services, since this is a more accurate description
...
remove duplicate mock inventory service
2009-11-12 18:44:03 +00:00
d21fc1cefb
minor: for now stop iar tests spewing log messages when running testsuite
2009-11-12 18:33:40 +00:00
bb92ba97c6
Stop iar save failing on corrupt assets
...
Not ideal since one will still have to watch out for big 'corrupt asset' messages in the log, but better than an outright fail
2009-11-12 18:26:22 +00:00
cbe1cc1bc8
minor: refactor common setup in uuid gatherer test
2009-11-12 17:50:09 +00:00
55a40694e7
minor: remove mono compiler warning
2009-11-12 17:42:26 +00:00
cedd827f7f
* Added some new syntax options for the Monitor Module's HTTP poll.
2009-11-12 11:17:04 +11:00
8ae3df22a2
clean up some cruft
2009-11-11 11:10:42 -08:00
6d88c96e01
minor: remove mono compiler warning
2009-11-11 18:49:05 +00:00
00102e73a6
Add basic new uuid gatherer tests to check behaviour when the gather seed is a missing asset
2009-11-11 18:46:04 +00:00
4a2d82e14b
* Thanks to a little help from jhurliman, jradford, diva, mono's brajkovic, miguel, and the fabulous bug reports by our community members.. The workaround fix for the "ERROR:metadata.c:3211:mono_metadata_token_from_dor: code should not be reached" bug in the RegionCombinerModule.
2009-11-11 02:47:17 -05:00
c8268a270f
* Fix resources file mapping
2009-11-11 00:00:21 -05:00
1bb510ab17
* Update namespace in the regioncombinermodule.
2009-11-10 23:43:18 -05:00
2e514bfb1b
* Move RegionCombinerModule to it's own project
...
* Moves the mono_metadata_token_from_dor message to a different module on loading.
2009-11-10 22:40:08 -05:00
05f7fa1543
Broke the monster RegionLoaded method in RegionCombinerModule into 4 smaller methods. Let's see if this avoids a mono bug that is making megaregions not work in mono. Long shot, but worth a try.
2009-11-10 10:39:16 -08:00
3294714099
Updated HGUserServices with AuthenticateUserByPassword, so that iar works.
2009-11-10 07:57:54 -08:00
90b15aa440
* Added HTTP polling for Statistics Monitor Module (access via http://sim.com:httpport/monitorstats/regionUUID/ )
...
* Returns simple formatted XML document containing statistical data on the current sim.
* Example:
<data>
<AgentCountMonitor>5.0000</AgentCountMonitor>
...
</data>
2009-11-11 00:22:06 +11:00
167c15db9d
Fixed XMLRPC return params
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-11-10 04:14:41 +00:00
ba99081bbe
Add IScriptModuleComms interface and region module to handle dispatch of
...
script messages to region modules and sending back replies.
Hook IScriptModuleComms.OnScriptCommand to see commands and use
DispatchReply to reply to the script. It is recommended to pass the "id"
parameter from the event as the "k" parameter of the reply.
The script will receive the reply as a link message from link -1.
2009-11-10 03:36:43 +00:00
af9b0dcc20
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
2009-11-09 18:49:13 -08:00
3e22bb24f5
add an overload to _SculptMesh for meshing from a list of coordinates
...
add conditional compilation for System.Drawing dependency
2009-11-09 18:44:03 -08:00
7df7e6a0bb
Add modSendCommand function (note, this is a new API module, using the API
...
extension mechanism, it's not a osFunction!
2009-11-10 01:22:14 +00:00
5145dfa53c
* Removing the redundant SendPrimitiveTerseData.State field, it duplicates AttachPoint
...
* LLClientView.CreateImprovedTerseBlock() now uses AttachPoint and does the proper high-low swap (this should fix disappearing attachment pieces)
2009-11-09 17:13:56 -08:00
a88a463b50
Following various discussions on irc and in the OpenSim dev OSGrid meeting last week, change av_capsule_tilted to false by default
...
This appears to now give better ODE physics response (less sinking into the ground, etc.)
Please change it back if this is actually a bad idea for some reason
2009-11-09 19:26:42 +00:00
3274bc39c8
minor: remove some mono compiler warnings
2009-11-09 17:43:32 +00:00
7f5d0a6735
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-09 17:36:28 +00:00
716f70cd31
refactor out iar escaping
2009-11-09 17:34:07 +00:00
1ded7edde2
minor: correct slightly over-enthusiastic load iar logging message
2009-11-09 17:24:06 +00:00
7c5dc94cc8
fix load iar regression accidentally introduced in last commit
2009-11-09 17:22:18 +00:00
3c1f50127c
minor: tweak load iar messages to be slightly less verbose
2009-11-09 17:20:30 +00:00
fbcf6ffc18
minor: provide updates on number of assets loaded while executing "load iar"
2009-11-09 17:17:25 +00:00
1afe5a528c
minor: remove some mono compiler warnings
2009-11-09 17:09:56 +00:00
ae92bbcb95
refactor: break actual item load in iar into separate method
2009-11-09 17:04:05 +00:00
a0c1836fde
minor: remove some old commented out load iar code
2009-11-09 16:43:35 +00:00
678a74e4f7
Tell the user when a 'save iar' has failed because the inventory path could not be found
2009-11-09 16:42:17 +00:00
a3105a34ca
Implement human / escaping for inventory folders as well as items
2009-11-09 16:12:13 +00:00
6820cc93ec
refactor path delimiter in iar utils
2009-11-09 16:08:17 +00:00
a7af92d5d0
minor: remove some mono compiler warnings
2009-11-09 16:03:15 +00:00
9b2592a960
refactor: make human iar escape char a constant rather than a magic char
2009-11-09 15:54:43 +00:00
668850b974
* for iars, allow item names/folders including "/" to be escaped using "\/"
...
* also, "\" has to be escaped as "\\"
* add item name unit test for escaped characters
2009-11-09 15:49:09 +00:00
f8bcbe5492
remove the debug stuff
2009-11-08 22:39:00 +00:00
aff5fe10b0
test commit with debug output per folder fetch. NOT FOR PRODUCTION, SPEWY
2009-11-08 22:29:36 +00:00
81c439bcaa
Patch from Snoopy2. Fixes Mantis #4342
...
fixes problems when group owned land was abandoned by the land owner or reclaimed by the estate manager or by god.
Beside that this new patch makes it possible, that users can buy land directly for a group, if the buyer has the required permissions.
2009-11-08 20:36:00 +00:00
1cddc85078
Fixing the build break
2009-11-06 00:06:49 -08:00
dfe4dc735a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-11-05 23:50:42 -08:00
6ed57814c1
* Clamp the CoarseLocationUpdate packet at a maximum of 60 positions per packet. This is a limitation of LLUDP, nothing we can really do about it
...
* Marking CoarseLocationUpdate as *not* zerocoded. Zerocoding can only save space when a packet contains three or more contiguous zeroes, and will use more space if it contains single zeroes randomly scattered through the packet (which is what you see when you send a long list of UUIDs)
2009-11-05 23:50:17 -08:00
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
e6d7303b29
Applying #4332 , optional packet statistics logging
2009-11-05 12:01:40 -08:00
f8f1e94cf8
add unit test for iar & escaping
2009-11-05 19:32:24 +00:00
6f4a588397
minor test var name tweak
2009-11-05 19:09:32 +00:00
bae03dfcbd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-05 18:53:57 +00:00
345ddcd0d8
* Escape / character when saving items and folders in an iar so that the loader doesn't barf
2009-11-05 18:53:25 +00:00
ec0d5b408a
Change the permissions module to use the friend list cache already in the
...
friends module instead of requesting the entire friends list over the
network each time a prim is touched.
2009-11-05 17:29:52 +00:00
b098572525
Remove a spammy debug message from friends list check in the perms module.
...
Replace the integer compares with proper bitflags checking from libOMV.
Friends rights are now functional.
2009-11-05 16:46:39 +00:00
83b4b4440b
Patch by revolution, thank you. Mantis #1789 . Implement friends permissions.
...
Applied with major changes. Core functionality commented pending review
for possible rights escalation. No user functionality yet.
2009-11-05 02:09:07 +00:00
30a2411e58
Separate folder and item limit for UDP inventory packets. Folder limit is
...
now 6, as before, item limit is 5. This should avoid most, if not
all, oversized packets.
2009-11-04 23:54:19 +00:00
a431f346e7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-04 23:29:42 +00:00
a13e25ebbe
Initialize SceneObjectPart.RotationOffset to Quaternion.Identity
2009-11-04 16:19:56 -08:00
f57a646638
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-11-04 16:08:23 -08:00
ec2ebf2598
Removing EntityBase.Rotation
2009-11-04 16:08:10 -08:00
b6ea7c26ac
Refine oversized packet handling as per jhurliman. Reallocate the buffer to
...
actual packet size only for oversized packets.
2009-11-04 23:12:56 +00:00
58be90d2b1
Add some length to the backet buffer for packet sending so oversize
...
inventory packets don't make us barf
2009-11-04 22:47:40 +00:00
9dd5d63495
minor: remove some mono compiler warnings
2009-11-04 19:44:28 +00:00
535f4597c1
Add an overload to OutPacket as per jhurliman. Switch hacky workaround
...
for InventoryDescendents to the proper way
2009-11-04 04:36:19 +00:00
cfcb5faa4e
Bounce the pacjet items limit back up to 6
2009-11-04 04:09:46 +00:00
5bcc02c97b
Prevent autosplitting of inventory descendents packets. Also reduces the
...
number of items per packet to 5 to prevent asserts
2009-11-04 03:56:31 +00:00
4d2ecd1236
Correctly set the totall number of descendents in inventory retrieval
2009-11-04 03:07:21 +00:00
c72f78215b
Backport the fixes to WebFetchInventoryDescendents to the UDP
...
InventoryDescendents packet. Testing has shown that UDP inventory now
works flawlessly and, unlike CAPS inventory, doesn't download the entire
agent inventory on start. Neither does it incessantly re-request folder
NULL_KEY. Therefore, I have disabled CAPS inventory.
2009-11-04 01:56:19 +00:00
00130841db
Remove parallel loading from XEngine, but retain the new design where
...
all scripts are loaded from the same thread, rather than launching a
new one for each script. This is only marginally slower, but avoids the
race condition that led to script engine failure.
2009-11-03 20:23:50 +00:00
af0e5d0974
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-03 19:11:09 +00:00
1d737b010c
minor: remove some mono compiler warnings
2009-11-03 18:52:20 +00:00
9e6f01321e
Fixed a couple of NREs in corner cases.
2009-11-03 10:24:02 -08:00
82554e9a89
Delete depricated extrusion methods and redirect to universal extrude method.
...
Sync with PrimMesher.cs r47 on forge.
2009-11-02 22:24:58 -08:00
1927945053
Another race condition fix in SceneObjectGroup
2009-11-02 15:09:07 -08:00
0e8b5c7ffa
Fixing race conditions in the SceneObjectPart properties
2009-11-02 11:40:57 -08:00
67ac9881fa
Removing duplicate SceneObjectPart.RotationalVelocity property
2009-11-02 11:28:35 -08:00
3c0881c83c
* Committing missing file from last commit.
2009-11-02 00:20:41 +11:00
838bc80ab9
* Implemented some tweaks to monitoring module.
...
* Output is prettier & more useful.
* Added 'Alerts' to allow rules to be constructed using Monitors to detect for events such as deadlocks. This will be translated to SNMP Traps when I get SNMP implemented.
2009-11-02 00:05:49 +11:00
711dde34e4
* Implements new 'Monitoring' system for reporting performance.
...
* Mostly the same set as the StatsMonitor used for Viewer notification, but exposes some new frametimes - including EventMS, PhysicsUpdateMS, LandUpdateMS; new memory monitoring - both GC.TotalMemory and Process.PrivateWorkingMemory64; also exposes ThreadCount (using System.Diagnostics.Process)
* Type 'monitor report' on the console to see output.
* SNMP Implementation forthcoming.
2009-11-01 19:37:40 +11:00
58c260140c
Patch + minor formatting fixes.
2009-10-31 19:10:33 -07:00
7f4d646aea
http://opensimulator.org/mantis/view.php?id=4337
2009-10-31 19:05:02 -07:00
c6246050d9
Make the default and max RTO configurable int he linden client stack
2009-10-30 22:07:56 +00:00
92f4835ba6
Convert the AvatarGroupsReply message to the event queue.
2009-10-30 19:54:56 +00:00
39f95e8cf0
Add a using for OSD to the client view
2009-10-30 19:44:01 +00:00
cb1492aaf0
Fixed a regression in SendAvatarGroupsReply()
2009-10-30 13:18:18 -07:00
5d5d0e699a
* Disables automatic packet splitting on AvatarGroupsReply packets. This packet is a mess and shouldn't be used at all (in favor of the event queue message)
...
* Clean up the way we send AvatarGroupsReply packets, including clamping the group name and group title
2009-10-30 11:12:32 -07:00
8a73dc0f8a
* Fix for a potential race condition in ScenePresence.AbsolutePosition
...
* Unified the way region handles are stored and used in ScenePresence
* Fixed camera position for child agents
* CheckForSignificantMovement now checks avatar and camera position (both are important for scene prioritization)
* Removing debug code from the previous commit
2009-10-30 03:01:15 -07:00
7965b6eb61
* Moving parcel media and avatar update packets from the unthrottled category to task
...
* Fixing a bug where the max burst rate for the state category was being set as unlimited, causing connections to child agents to saturate bandwidth
* Upped the example default drip rates to 1000 bytes/sec, the minimum granularity for the token buckets
2009-10-30 00:43:46 -07:00
a05c67bebb
* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll
...
* Prints a warning for any future packet splitting failures
2009-10-30 00:08:41 -07:00
aecaa51063
* Fixed a NullReferenceException in GetMovementAnimation() and added more protection against NREs in AddNewMovement()
...
* Removed the three second limit on ImprovedTerseObjectUpdate. With the latest fixes I don't think this is necessary, and it generates a lot of unnecessary updates in a crowded sim
2009-10-29 16:31:48 -07:00
2913c24c8a
* Commented out two noisy debug lines in the LLUDP server
...
* Misc. cleanup in ScenePresence.HandleAgentUpdate()
2009-10-29 15:24:31 -07:00
ec7fd8b1f8
More performance improvements to XEngine script loading
2009-10-29 06:42:40 -07:00
dd13fa361b
* Misc. formatting cleanup for the previous patch
...
* Added the new AppDomainLoading variable to the [XEngine] section in the example config
2009-10-29 05:56:37 -07:00
33448e4ba8
Optimizations
2009-10-29 05:39:18 -07:00
5c894dac8b
* Implemented foot collision plane for avatars
...
* Fixed a NullReferenceException regression
2009-10-29 05:34:40 -07:00
3f2d6fe470
Ported the Simian avatar animation system to OpenSim. Landing is currently not working
2009-10-29 04:13:51 -07:00
fd2c99f184
Fixing NullReferenceException regression in the previous commit
2009-10-29 02:10:48 -07:00
7132877075
* Log progress messages when loading OAR files with a lot of assets
...
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
2009-10-29 01:46:58 -07:00
59eb378d16
Small performance tweaks to code called by the heartbeat loop
2009-10-28 23:10:16 -07:00
1c9696a9d2
Always send a time dilation of 1.0 while we debug rubberbanding issues
2009-10-28 15:11:01 -07:00
a069a1ee68
Limit physics time dilation to 1.0
2009-10-28 14:44:05 -07:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
c003f49432
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-28 12:45:56 -07:00
a65c8cdc38
* Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars
...
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
2009-10-28 12:45:40 -07:00
ee0f7e10c8
Fixed a bad check on velocity in the ODE near() callback (it was only checking for velocity in certain directions, and was calling the get_Velocity() function three times)
2009-10-28 12:20:34 -07:00
184e85cdec
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-28 18:26:31 +00:00
c17359fea5
Adding changes to previous patch to make it fit into core better
2009-10-28 18:25:37 +00:00
bff0d75e0f
patch kill by UUID
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-10-28 18:09:50 +00:00
cdbeb8b83b
Track timestamps when terse updates were last sent for a prim or avatar to avoid floating away forever until a key is pressed (deviates from SL behavior in a hopefully good way)
2009-10-28 03:21:53 -07:00
587c35f6b6
Marking ImprovedTerseObjectUpdate packets for avatars as unthrottled to test
2009-10-28 02:30:16 -07:00
2d470f8bde
Switching sculpty from CSJ2K back to OpenJPEG for now until more kinks are ironed out
2009-10-28 01:48:53 -07:00
e31024f08b
Print the exception message when CSJ2K decoding fails for sculpty textures
2009-10-28 01:30:39 -07:00
8254256fe9
Modified visibilities of properties and methods. This is so that SL client based clients can use UDP server that is inherited from LLUDPServer.
2009-10-28 00:41:13 -07:00
6a6a8df1ba
Make map search work also for hyperlinked regions.
2009-10-27 20:32:48 -07:00
0c466b28bb
Move the calculation of time dilation from the scene to the physics engine. The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking
2009-10-27 16:24:43 -07:00
1113b3b6eb
Merge branch 'vehicles' into tests
...
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2009-10-27 22:42:55 +01:00
f89c2cac0f
Experimental test to rate limit the incoming packet handler and try to always leave a worker thread available for other tasks
2009-10-27 14:16:01 -07:00
2525810e2a
Removed the DotNetEngine scripting engine. You will need to create a fresh checkout or clean out all *DotNet*.dll assemblies from the bin/ directory to run OpenSim moving forward
2009-10-27 13:31:04 -07:00
fefe767476
Lowering the position tolerance of terse updates for ScenePresences to mitigate some of the rubberbanding issues while we are sending incorrect time dilation values
2009-10-27 13:16:58 -07:00
a81a16f22f
llRotLookAt Pt 2
2009-10-27 19:56:39 +01:00
a718d7d56a
Making the defaults for interest management variables match whether you have the [InterestManagement] section in your config or not
2009-10-27 10:17:20 -07:00
bcd7593dfb
Forgot a line in the previous commit
2009-10-27 10:07:35 -07:00
3a1ee79ee4
Finally hunted down the Parallel deadlock. Packets were being handled asynchronously (filling up the threadpool with handlers), which would turn around and try to do parallel operations on the starved threadpool. The solution for now is to disable Parallel.cs operations until we can gracefully handle parallel operations with a potentially starved threadpool
2009-10-27 02:36:57 -07:00
c75d415648
* Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) to use a non-blocking parallel method when operating in async mode
...
* Minor code readability cleanup
2009-10-27 00:26:56 -07:00
f5cad91578
* Switched from OpenJPEG to CSJ2K in Meshmerizer
...
* Tested the previous patch and found no regressions
2009-10-26 19:03:55 -07:00
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
b6651ce790
* Double the priority on avatar bake texture requests to get avatars rezzing in faster than the surrounding scene
...
* Adds duplicate tracking for SceneObjectParts and ScenePresences to avoid sending out duplicate ImprovedTerseObjectUpdate packets
2009-10-26 18:22:32 -07:00
0b1726b524
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 16:48:43 -07:00
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
119cf80e13
Added calls to GC.AddMemoryPressure() when unmanaged memory is allocated for ODE (helps the GC make better scheduling choices), and a call to GC.Collect() right before logins are enabled for a region. Although this doesn't change actual memory usage, it improves the reported usage from OpenSim and the operating system
2009-10-26 15:52:59 -07:00
428bd7a74b
No need to create dupe TriMeshData for ODE. A previous patch created a dictionary to store unique meshes in Meshmerizer based on creation params. This patch contains a dictionary to map each of those unique meshes to its ODE TriMeshData. This eliminated hundreds of megabytes of memory consumption in the unmanaged heap when there are lots of the same prim (roof tiles, bricks, siding, decks, chairs, etc). The objects do not need to be physical to benefit from this patch.
2009-10-26 15:14:19 -07:00
ad624f703d
ParcelObjectOwnersReplyPacket has null DataBlock when a client requests a list of their prims in the region and none exist. Instead of leaving pack.Data null, this patch sets a new DataBlock[0];
2009-10-26 15:14:13 -07:00
ff4b45a1e3
Do case-insensitive comparisons on region names in LLStandaloneLoginModule
2009-10-26 15:12:43 -07:00
ac7ccdf7d7
* Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later
...
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
2009-10-26 14:41:27 -07:00
c04775bf68
Changed UseCircuitCode handling to be synchronous or asynchronous depending on the async_packet_handling config option, and added a debug log message when a UseCircuitCode packet is handled
2009-10-26 13:38:07 -07:00
ff65b50236
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-26 11:28:43 -07:00
2222172afa
Removed an unnecessary lock in LLUDPClient.UpdateRTO() and LLUDPClient.BackoffRTO()
2009-10-26 11:28:02 -07:00
1209db6dcd
Thank you, RemedyTomm, for an update to your previous patch. Garbage-collect
...
the transfers that never happen.
2009-10-26 15:51:28 +00:00
7df54d4ad2
Thank you, RemedyTomm, for a patch to handle Xfer requests being dropped
...
before the file data to be transfered is ready.
2009-10-26 04:52:11 +00:00
8428b25939
Add llRotLookat pt1.
2009-10-26 00:10:23 +01:00
de25dcfb7b
Minor tweaks to get OpenSim compiling against both the current libomv and the upcoming 0.8.0
2009-10-25 01:10:02 -07:00
730930955a
Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
...
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff
* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()
* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
2c34619aea
* Changed various modules to not initialize timers unless the module is initialized. Ideally, the timers would not initialize unless the module was actually enabled, but Melanie's work on configuring module loading from a config file should make that unnecessary
...
* Wrapped the Bitmap class used to generate the world map tile in a using statement to dispose of it after the JPEG2000 data is created
2009-10-23 14:22:21 -07:00
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
c749cf0061
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-23 10:37:01 -07:00
4c45b5fd3c
Cleaning up OpenSim.ini.example for LLUDP. The [LLClient] section has been removed and several new parameters have been added to [ClientStack.LindenUDP]
2009-10-23 10:35:47 -07:00
8ba3afb59b
Patch from dslake http://opensimulator.org/mantis/view.php?id=4291 0004291: Inconsistent locking of ODE tainted prims
2009-10-23 12:14:05 -04:00
71c929137f
Inconsistent locking of SenseRepeaters in Script Engine.
...
When I attempt to 'save oar' on a region with thousands of scripts with timers, I get a NullReferenceException every time. The problem comes from inconsistent locking in SensorRepeat.cs of the SenseRepeaters List. It is iterated and modified in many places and these places are all wrapped in a lock except in the GetSerializationData(). This is the function throwing the exception because an item in the list becomes null during iteration.
The attached patch locks SenseRepeatListLock in GetSerializationData()
2009-10-23 11:25:06 +01:00
62f1a5e36d
Implemented a "FrontBack" prioritizer, using distance plus the plane equation to give double weight to prims/avatars in front of you
2009-10-23 02:38:59 -07:00
37f7277378
Uncommented the resend log line so the previous commit can be seen in action
2009-10-23 01:33:43 -07:00
ac0acb0296
* Changed the max RTO value to 60 seconds to comply with RFC 2988
...
* Implemented section 5.5, exponential backoff of the RTO after a resend
2009-10-23 01:33:05 -07:00
53bf479bab
Commented out noisy debugging about resent packets (normal) and agents setting throttles (normal)
2009-10-23 01:11:40 -07:00
588361e2a2
Experimental change to use an immutable array for iterating ScenePresences, avoiding locking and copying the list each time it is accessed
2009-10-23 01:02:36 -07:00
f34e8adffb
* Moved Copyrights above the comments in ODEPrim and ODEDynamics so they're consistent with the rest (and so chi11ken's auto copyright adding script doesn't duplicate the copyright.
2009-10-22 18:28:42 -04:00
ba2972eaf6
* Send out m_bodyRot everywhere instead of m_rotation. Still have no clue which is right
...
* Fix WorldMapModule.process() to not trip the watchdog timer
2009-10-22 14:33:54 -07:00
4ba3842d71
Forgot to hit save in the last commit
2009-10-22 13:24:24 -07:00
167d8e39fa
* Sending (position - hipoffset) instead of position
...
* Sending m_rotation instead of m_bodyRot in full updates to match terse updates (no idea which one is right!)
2009-10-22 13:14:41 -07:00
a16c3bf446
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-22 12:34:47 -07:00
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
91084653bd
Commented out instrumentation in ODEPrim.cs
2009-10-22 21:14:00 +02:00
227c832d3b
Commented out instrumentation in ODEPrim.cs
2009-10-22 19:15:35 +01:00
fc4ff09181
Merge branch 'vehicles'
2009-10-22 17:39:19 +01:00
84ac0f56f5
Fixing the patch to the patch
2009-10-22 17:36:52 +01:00
47d8b6c5f5
Fix rounding error in PRIM_SIZE portion of llSetPrimitiveParams
2009-10-22 17:36:49 +01:00
d756fa01ae
Add copyright header. Formatting cleanup.
2009-10-22 18:57:24 +09:00
5d07e18980
A synchronous call to the messaging server was blocking the process of promoting an agent to a root agent (logins and teleports). Changed to an async method
2009-10-22 02:27:06 -07:00
2f394b7e7e
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)
...
* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 01:30:12 -07:00
c4969d47d9
Merge branch 'master' into vehicles
2009-10-22 07:12:10 +01:00
b35fbe1f98
Merge branch 'melanie_test' into prioritization
...
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
2009-10-22 07:02:21 +01:00
32ccd5bb40
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget()
...
* Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-21 23:03:18 -07:00
624af66c35
Make the LSL scripting delays take full effect. To tune, tweat the
...
ScriptDelayFactor in config
2009-10-22 05:42:34 +01:00
8ce4fd7234
Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2
2009-10-22 04:02:26 +01:00
8a336c6860
Add MaxPoolThreads in startup to limit the size of the thread pool used
...
for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 02:28:53 +01:00
6492640e72
* Change the OnQueueEmpty signature to send the flags of the queues that are empty instead of firing once per empty queue
...
* Change the OnQueueEmpty firing to use a minimum time until next fire instead of a sleep
* Set OutgoingPacket.TickCount = 0 earlier to avoid extra resends when things are running slowly (inside a profiler, for example)
2009-10-21 18:03:41 -07:00
4e04f6b3a5
* Clarified what FireQueueEmpty is doing with a MIN_CALLBACK_MS constant and upped it to 30ms
...
* Removed the unused PacketSent() function
* Switched UnackedPacketCollection from a SortedDictionary to a Dictionary now that the sorting is no longer needed. Big performance improvement for ResendUnacked()
2009-10-21 17:02:55 -07:00
2b39ff0a39
Merged master into prioritization
2009-10-21 16:24:17 -07:00
b06f258319
* FireQueueEmpty now checks if a measurable amount of time has passed, and if not it sleeps for a small amount of time. This throttles OnQueueEmpty calls where there is no callback or the callback is doing very little work
...
* Changed HandleQueueEmpty()'s Monitor.TryEnter() calls to locks. We want to take our time in this function and do all the work necessary, since returning too fast will induce a sleep anyways
2009-10-21 16:21:08 -07:00
2752a3525c
* Changed the timing calculations for sending resends/acks/pings from per-client back to per-scene
...
* Testing a fix from Jim to make the cpu usage fix cleaner
2009-10-21 15:22:23 -07:00
62f1bfd136
Testing out a hack to identify the source of the high cpu usage
2009-10-21 14:25:22 -07:00
bb4da417ad
Removing the Sleep(0) call from the OutgoingPacketHandler
2009-10-21 14:03:49 -07:00
7ee422a344
* Handle UseCircuitCode packets asynchronously. Adding an agent to a scene can take several seconds, and was blocking up packet handling in the meantime
...
* Clamp retransmission timeout values between three and 10 seconds
* Log outgoing time for a packet right after it is sent instead of well before
* Loop through the entire UnackedPacketCollection when looking for expired packets
2009-10-21 13:47:16 -07:00
d88bb83136
Fix llParticleSystem to accept LSL variables and LSL constants in place
...
of the named constants for the rule selector.
Information provided by Snowcrash
2009-10-21 20:47:24 +01:00
9178537e94
* Replaced the UnackedPacketCollection with a lockless implementation. The tiny amount of time spent in the locks turned into a lot of time when the rest of the LLUDP implementation went lockless
...
* Changed the timer tracking numbers for each client to not have "memory". It will no longer queue up calls to functions like ResendUnacked
* Reverted Jim's WaitHandle code. Although it was technically more correct, it exhibited the exact same behavior as the old code but spent more cycles. The 20ms has been replaced with the minimum amount of time before a token bucket could receive a drip, and an else { sleep(0); } was added to make sure the outgoing packet handler always yields at least a minimum amount
2009-10-21 11:59:48 -07:00
8dd15fd5a5
Patch by mcortez: Remove lock from scene presence updating in groups module
2009-10-21 18:45:37 +01:00
c0c845aea4
Fixed the way OnQueueEmpty is called to prevent simultaneous calls for the same category
2009-10-21 01:07:40 -07:00
cde47c2b3d
Committing Jim's optimization to replace the 20ms sleep in outgoing packet handling with an interruptible wait handle
2009-10-21 00:18:35 -07:00
45dc4e0a54
* Added a sanity check to GetScriptAssemblies() and GetScriptStates() for the case where no scripting engine is enabled
...
* Added TokenBucket.cs to OpenSim, with some fixes for setting a more accurate MaxBurst value and getting a more accurate Content value (by Drip()ing each get)
2009-10-20 18:19:17 -07:00
1833c69568
* Removed the unused m_agentUpdates collection and some extra work that was being done for AgentUpdate packets
...
* Start LLUDPClients unpaused (this variable is not being used yet)
2009-10-20 15:19:19 -07:00
d38f33736c
* Removed the throttle speed optimizations to see if it brings stability back
...
* Changed the outgoing packet handler to use a real function instead of a closure and to track time on a per-client basis instead of a global basis
2009-10-20 14:41:20 -07:00
d1ab11dc2a
Added try/catches in the outgoing packet handler to match the one in the incoming packet handler
2009-10-20 12:43:09 -07:00
99abe885c8
Fixing position/rotation/collisionplane in ObjectUpdate packets for avatars
2009-10-20 12:30:34 -07:00
edd393ff30
Reverting the deletion of files related to texture sending until we figure out exactly what is and isn't needed
2009-10-20 11:58:23 -07:00
8151190a45
* Removing ODEPrim and ODECharacter GetHashCode() overrides since they were based on something that could change
...
* Tweaked a few other GetHashCode() overrides to bring them in line with MSDN recommendations
2009-10-20 10:56:15 -07:00
9a5e7222ce
* Removing cruft left over from the conversion to the new texture sending and UDP code
...
* Changing the cache modules to only initialize the caches if they are actually enabled. Should save a bit of resources from unused cache systems
2009-10-20 10:33:23 -07:00
26863c04a5
Change "config save" to "config save <filename>", which is mandatory.
...
File name is enforced to NOT be OpenSim.ini
2009-10-20 14:02:11 +01:00
182693628c
Fix for index error in llList2String
2009-10-20 02:09:24 -07:00
0a6ea33ac8
* Optimized sending of terrain data
...
* Send terrain data in a spiral pattern instead of a typewriter pattern (placeholder until terrain data becomes part of the interest list management)
* Added a debug line when resent packets are being sent
2009-10-19 18:50:31 -07:00
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
72078195c2
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:20:38 -07:00
bd03cbd815
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:19:37 -07:00
142008121e
* Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This avoids .NET remoting and a managed->unmanaged->managed jump. Overall, a night and day performance difference
...
* Initialize the LLClientView prim full update queue to the number of prims in the scene for a big performance boost
* Reordered some comparisons on hot code paths for a minor speed boost
* Removed an unnecessary call to the expensive DateTime.Now function (if you *have* to get the current time as opposed to Environment.TickCount, always use DateTime.UtcNow)
* Don't fire the queue empty callback for the Resend category
* Run the outgoing packet handler thread loop for each client synchronously. It seems like more time was being spent doing the execution asynchronously, and it made deadlocks very difficult to track down
* Rewrote some expensive math in LandObject.cs
* Optimized EntityManager to only lock on operations that need locking, and use TryGetValue() where possible
* Only update the attachment database when an object is attached or detached
* Other small misc. performance improvements
2009-10-19 15:19:09 -07:00
590d91e572
Forgot {} on last commit.
2009-10-19 15:03:55 -07:00
2dd8a6beac
More instrumentation in physics.
2009-10-19 14:48:17 -07:00
ffd59868f5
Merge branch 'master' into vehicles
2009-10-19 21:58:51 +01:00
6d04a213d6
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-18 20:25:16 -07:00
233e16b99c
* Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away
...
* Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters
* Made Parallel.ProcessorCount public
* Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes()
* More cleanup of the ScenePresences vs. ClientManager nightmare
* ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
2009-10-18 20:24:20 -07:00
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
baed19d068
A bit of instrumentation to figure out what's going on with physics actors.
2009-10-18 16:48:44 -07:00
1dbbf6edb6
* Process the avatar terse update priority queue as soon as an update for our own avatar is ready to send
...
* Reduce the scope of the locks when processing the update queues
* Reuse the ImprovedTerseObjectUpdate.RegionData block
2009-10-18 03:15:36 -07:00
2f2eeb6731
Zero out PrimitiveBaseShape.SculptData after the JPEG2000 data has been decoded to allow garbage collection on it
2009-10-18 02:53:36 -07:00
b4526a5a6d
* Big performance increase in loading prims from the region database with MySQL
...
* Handle the AgentFOV packet
* Bypass queuing and throttles for ping checks to make ping times more closely match network latency
* Only track reliable bytes in LLUDPCLient.BytesSinceLastACK
2009-10-18 02:00:42 -07:00
a3f93cffb4
* Committing Nini.dll with the patch from #3773 applied
...
* Fixing a log message typo
2009-10-17 22:06:36 -07:00
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
e28ac42486
Wrapped the contents of the IncomingPacketHandler loop in a try/catch statement
2009-10-17 17:19:18 -07:00
66923983a7
Add support for display of the script compilation errors in the script editor's
...
debug pane. This will still use DEBUG_CHANNEL currently, since it is not
fully implemented. This also removes the "Compiled successfully" message
that pops up in the viewer.
2009-10-17 22:36:44 +01:00
cdcbd22ba8
Merge branch 'master' into prioritization
2009-10-17 14:51:17 +01:00
c7da13eb23
Adds SendAvatarInterestsUpdate to IClientAPI
...
Thank you, Fly-Man
2009-10-17 14:50:21 +01:00
9c21d672d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 18:32:12 -07:00
01051daaab
* One more tweak to inform the user that they may not be able to move until relogging.
2009-10-16 21:24:08 -04:00
d49424c421
* After seeing it repeat over and over again.. again, We won't inform the scenepresence that there was an issue so it doesn't try to make the capsule again. I have a feeling that this is some kind of object leak. We'll know for sure.. soon.
2009-10-16 21:20:55 -04:00
c81378dc22
Changing avatar movement updates to the Task throttle category until we get finer grained prioritization of avatars vs. prims
2009-10-16 17:33:41 -07:00
7d6d94a7b5
More debugging of RegionCombinerModule.RegionLoaded() by making RegionLoaded() a two line function
2009-10-16 16:49:13 -07:00
31dfe87570
Prevent oversized packets from crashing the LLUDP server. It will now print a friendly error message and drop the packet
2009-10-16 14:26:58 -07:00
1bd9202f24
* Simplified the prioritization packet creation code to reduce CPU usage and increase throughput. Apologies to Jim for hacking on your code while it's only halfway done, I'll take responsibility for the manual merge
...
* Changed LLUDP to use its own MTU value of 1400 instead of the 1200 value pulled from the currently shipped libomv
2009-10-16 14:17:13 -07:00
b813058635
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 13:29:12 -07:00
f5964347bd
* fix previous commit
2009-10-16 16:25:48 -04:00
e776dfb1d7
* Changing the "clean dropped attachments" MySQL command to a using statement inside a try/catch. This statement times out for me very frequently
...
* More verbose logging when zerocoding fails on an outbound packet
2009-10-16 13:22:45 -07:00
ac31cb89d5
* Ensure that at least 20 frames run before letting avatar in.
2009-10-16 16:22:10 -04:00
eee1318597
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 12:42:53 -07:00
a18489dc9b
* Change appearance packets from State to Task. This will hopefully fix the cloud issues
...
* Changed the throttling logic to obey the requested client bandwidth limit but also share bandwidth between some of the categories to improve throughput on high prim or heavily trafficked regions
2009-10-16 12:20:01 -07:00
0079d0a7c4
* One more attempt at the NullRef In The OdePlugin. This might fix it, but it will definitely get us closer to the root cause.
2009-10-16 14:30:55 -04:00
5a4fda9dc3
Updating OpenSim.ini.example with the section required to enable a useful prioritization scheme
2009-10-16 11:09:18 -07:00
06354a093d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 10:09:19 -07:00
5de657cf5d
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-16 13:29:07 +01:00
0487092d15
Thank you, Fly man, for plumbing the AvatarInterestsUpdate packet
2009-10-16 13:28:40 +01:00
67afa9e633
* Make sure to unregister the OutOfBounds Physics event in RemoveFromPhysicalScene or we'll be leaking
2009-10-16 03:52:57 -04:00
1f28c6208b
* Added a message for when the null reference exception occurs to make debugging easier. Without this, from the user's perspective.. they cannot move, fly or otherwise do anything physical and without a message on the console, it would be hard to tell that this is what is occurring.
2009-10-16 03:40:44 -04:00
ac2f98b846
* A hacky attempt at resolving mantis #4260 . I think ODE was unable to allocate memory, and therefore the unmanaged wrapper call fails or worse.. there's some unmanaged resource accounting in the ODEPlugin for ODECharacter that isn't being done properly now.
...
* The broken avatar may not be able to move, but it won't stop simulate from pressing on now. And, the simulator will try to destroy the avatar's physics proxy and recreate it again... but if this is what I think it is, it may not help.
2009-10-16 03:32:30 -04:00
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
df2d5a460f
Replaced the update lists with a priority queue implementation in LLClientView
...
Replaced the update lists with a priority queue implementation in LLClientView.
The priority queues are based on the MinHeap implementation also included in
this commit within the OpneSim.Framework namespace. Initially setup to exactly
mimic the behavior beofre the change which was a first come first serve queue.
2009-10-15 15:52:53 -07:00
d44b50ee46
* Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time
...
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
2009-10-15 15:25:02 -07:00
642084c2a9
Merge branch 'master' into vehicles
2009-10-15 21:16:05 +01:00
6deef7d0f3
Merge branch 'master' into vehicles
2009-10-15 21:14:13 +01:00
6d3d985511
* Request from lkalif to have the Sim send a coarselocationupdate for each avatar in the sim, including yourself.
...
* Apparently the LLClientView should have been doing this previously.. Also fixed the 'You' on the index block.. so the client doesn't display an extra green dot.
* Thanks lkalif for bringing it to our attention.
2009-10-15 02:01:29 -04:00
b1c93cd3b1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-14 19:24:09 -07:00
4790f8576c
* Replaced (possibly broken?) math for calculating the unix timestamp in MySQLAssetData with Utils.DateTimeToUnixTime()
...
* Disabled UpdateAccessTime() function since it was only writing zeros anyways. This gave me a significant performance improvement for startup times and avatar logins in standalone mode
* Load attachments asynchronously so avatars with lots of attachments don't have to race the timeout clock to login
2009-10-14 19:23:44 -07:00
cd321ec4d2
Moved some code up to AddRegion, so that other modules that depend on it don't crash. This code needs to be removed as soon as user services is refactored.
2009-10-14 19:15:11 -07:00
fe4109a5b0
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 16:48:42 -07:00
06990b074c
Allow the LLUDP server to run in either synchronous or asynchronous mode with a config setting, defaulting to synchronous mode
2009-10-14 16:48:27 -07:00
82012ec4e3
* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow more tweaking in the future
2009-10-14 16:21:48 -07:00
6bdd6ae0a0
Merge branch 'master' into htb-throttle
2009-10-14 23:31:38 +01:00
1e9e9df0b3
* Switched to a plain lock for the ClientManager collections and protected the TryGetValues with try/catch instead of a lock
...
* Added ClientManager.ForEachSync() for operations that need to run synchronously, such as "show connections"
2009-10-14 14:25:58 -07:00
25878d6828
* Added the "show connections" command to print out all of the currently tracked IClientAPIs
2009-10-14 13:00:42 -07:00
c033477d2f
* Read scene_throttle_bps from the config file and use it
...
* Minor formatting cleanup
2009-10-14 11:52:48 -07:00
4b5a2f8c02
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 11:44:17 -07:00
0d2e6463d7
* Minimized the number of times textures are pulled off the priority queue
...
* OnQueueEmpty is still called async, but will not be called for a given category if the previous callback for that category is still running. This is the most balanced behavior I could find, and seems to work well
* Added support for the old [ClientStack.LindenUDP] settings (including setting the receive buffer size) and added the new token bucket and global throttle settings
* Added the AssetLoaderEnabled config variable to optionally disable loading assets from XML every startup. This gives a dramatic improvement in startup times for those who don't need the functionality every startup
2009-10-14 11:43:31 -07:00
bea13e3709
Setting changeY in border crossing.
2009-10-14 11:01:46 -07:00
3795cface2
Enable LSL dialogs to display group names properly
2009-10-14 17:39:38 +01:00
d83ace0d3b
Merge branch 'master' into htb-throttle
2009-10-14 05:10:43 +01:00
4135b0c4dc
* Split Task category into Task and State
...
* Crude prioritization hack
2009-10-13 19:45:38 -07:00
5976ac16b0
Optimized heartbeat by calling Update() only on updated objects.
...
During the heartbeat loop, Update() is called on every SceneObjectGroup which in turn checks if any SceneObjectPart has changed. For large regions (> 100k prims) this work consumes 20-30% of a CPU even though there are only a few objects updating each frame.
There is only one other reason to check every object on every frame, and that is the case where a script has registered the object with an "at target" listener. We can easily track when an object is registered or unregistered with an AtTarget, so this is not a reason to check every object every heartbeat.
In the attached patch, I have added a dictionary to the scene which tracks the objects which have At Targets. Each heartbeat, the AtTarget() function will be called on every object registered with a listener for that event. Also, I added a dictionary to SceneGraph which stores references to objects which have been queued for updates during the heartbeat. At each heartbeat, Update() is called only on the objects which have generated updates during that beat.
2009-10-13 19:32:59 -07:00
31a61bbeec
* Fixes some prim crossings on megaregions with regions beyond the 512m mark
...
* There's a slight chance that this could cause a problem with regular prim crossings.. but hopefully not. Revert if it does.
2009-10-13 22:03:53 -04:00
e8c1e69a0d
* Copied LocklessQueue.cs into OpenSim.Framework and added the .Count property and .Clear() method
...
* Changed the way the QueueEmpty callback is fired. It will be fired asynchronously as soon as an empty queue is detected (this can happen immediately following a dequeue), and will not be fired again until at least one packet is dequeued from that queue. This will give callbacks advanced notice of an empty queue and prevent callbacks from stacking up while the queue is empty
* Added LLUDPClient.IsConnected checks in several places to prevent unwanted network activity after a client disconnects
* Prevent LLClientView.Close() from being called twice every disconnect
* Removed the packet resend limit and improved the client timeout check
2009-10-13 18:56:54 -07:00
dc11643c00
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
...
* Added some missing implementations of IClientAPI.RemoteEndPoint
* Added a ClientManager.Remove(UUID) overload
* Removed a reference to a missing project from prebuild.xml
2009-10-13 17:33:45 -07:00
395a8680c3
* Fixed a bug where clients were being added to ClientManager twice
...
* Changed the ClientManager interface to reduce potential errors with duplicate or mismatched keys
* Added IClientAPI.RemoteEndPoint, which can (hopefully) eventually replace IClientAPI.CircuitCode
* Changed the order of operations during client shutdown
2009-10-13 16:53:19 -07:00
23a334b9f5
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
...
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
2009-10-13 14:50:03 -07:00
c893761319
* Unregister event handlers in LLUDPServer when a client logs out and disconnects
...
* Move ViewerEffect handling to Scene.PacketHandlers
* Removing the unused CloseAllAgents function
* Trimming ClientManager down. This class needs to be reworked to keep LLUDP circuit codes from intruding into the abstract OpenSim core code
2009-10-13 12:50:59 -07:00
f55b282078
Avoid checking m_clients collection twice when a UseCircuitCode packet is received
2009-10-13 11:28:08 -07:00
82ace481c9
* Broke the circular reference between LLClientView and LLUDPClient. This should speed up garbage collection on the large LLClientView objects, and also prevents handling packets for disconnected clients
...
* Renamed local LLUDPClient variables to udpClient to avoid naming confusion between LLUDPClient and LLClientView
2009-10-13 11:14:45 -07:00
3828b3c0e8
* Eliminated unnecessary parameters from LLUDPServer.SendPacketData()
...
* Changed PrimMesher's Quat.Identity to return <0,0,0,1> instead of <0,0,0,1.1>
2009-10-13 10:38:35 -07:00
e3d5beebfb
Better handling of missing assets.
2009-10-13 06:39:11 -07:00
f3d2192cd4
Better handling of missing assets.
2009-10-12 18:30:06 -07:00
63ed605eba
Stop the recurring texture requests for textures that truly don't exist.
2009-10-12 17:36:13 -07:00
0cfbdf3894
Added this one file for the previous commit to work.
2009-10-12 17:01:03 -07:00
c0beeb929e
* Fixes http://opensimulator.org/mantis/view.php?id=4225
...
* Fixes http://opensimulator.org/mantis/view.php?id=3959
* Allows for viewing inventory textures outside home grid
2009-10-12 17:00:01 -07:00
bf68dad643
0004246: [Patch] FlotsamAssetCache deep scan & cache
...
Thank you, mcortez.
2009-10-12 23:21:32 +01:00
170d2c4660
Merge branch 'master' into htb-throttle
2009-10-12 15:25:42 +01:00
70553a979e
Merge branch 'master' into vehicles
2009-10-12 15:12:15 +01:00
50f509d600
Merge branch 'master' into vehicles
2009-10-12 15:11:01 +01:00
fe0940a22f
Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE enabled, the first Heartbeat loop call to UpdatePhysics takes 20 minutes. 75% of that time is spent in this sleep. (100k prims * 10ms)
2009-10-12 01:53:57 -07:00
ef6aa444bf
Fixed tree crossing. This will alleviate
...
http://opensimulator.org/mantis/view.php?id=4163
2009-10-11 13:46:19 -07:00
36dcfd2b80
* Changed logic of enabling LLProxyLoginModule to follow the new style -- true/false on the name, rather than gridmode=true.
...
* Better error messages on Add/Remove clients.
2009-10-11 10:23:16 -07:00
7b4183d7a0
sync PrimMesher with r46
2009-10-11 02:12:17 -07:00
41b27ef064
disambiguate System.Path (preparation for new PrimMesher)
2009-10-11 01:30:24 -07:00
5e6e31591c
Merge branch 'master' into htb-throttle
...
This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.
2009-10-10 10:26:47 +01:00
ef03b2d936
Fix selling objects
2009-10-10 10:18:16 +01:00
8271528b1f
* comment out the velocity test, using updates every 500 ms as set in ScenePresence.AddToPhysicalScene.
...
* This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms.
* This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update.
2009-10-10 04:01:36 -04:00
3f0dc88c46
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-10-10 03:54:10 -04:00
4ffe936ba8
* Make ODECharacter respect the scene's requested collision update time
...
* Set the Scene collision update time to 500 ms
2009-10-10 03:53:53 -04:00
d7654c3bda
Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for researching this.
2009-10-10 00:26:43 -07:00
5f94889044
* Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This may reduce avatar flailing.
2009-10-10 01:49:06 -04:00
798bce592f
* Move the 'On Collision Update Movement Animation' routine to above the 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway.
2009-10-10 01:16:34 -04:00
3f78ff6ee0
Slight variation on the locking scheme: now locking always, except the ForEach, which gets a copy of the Array. I think the ForEach was the big gorilla.
2009-10-09 19:16:03 -07:00
29543514e6
* Changed the "Packet exceeded buffer size" log line to debug and include the packet type. This message is normal, but could be evidence of a message marked for zerocoding that probably shouldn't be
...
* Changing OpenSimUDPBase back to high concurrency. High concurrency mode seems to make other problems happen faster, so it's helpful for working out other bugs and will probably
2009-10-09 16:33:50 -07:00
c8cc14a98b
This is to *try* to avoid the exception we are seeing repeatedly:
...
#13:53:03 - [LLUDPSERVER]: Packet exceeded buffer size during zerocoding. Removing MSG_ZEROCODED flag
#13:53:03 - [Scene]: Failed with exception System.ArgumentException: Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.
# at System.Buffer.BlockCopy (System.Array src, Int32 srcOffset, System.Array dst, Int32 dstOffset, Int32 count) [0x000b7] in /home/grid/install/mono24/mono-2.4.2.3/mcs/class/corlib/System/Buffer.cs:116
# at OpenSim.Region.ClientStack.LindenUDP.LLUDPServer.SendPacketData (OpenSim.Region.ClientStack.LindenUDP.LLUDPClient client, System.Byte[] data, Int32 dataLength, PacketType type, Boolean doZerocode, ThrottleOutPacketType category) [0x00060] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs:290
# at OpenSim.Region.ClientStack.LindenUDP.LLUDPServer.SendPacket (OpenSim.Region.ClientStack.LindenUDP.LLUDPClient client, OpenMetaverse.Packets.Packet packet, ThrottleOutPacketType category, Boolean allowSplitting) [0x00077] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs:265
# at OpenSim.Region.ClientStack.LindenUDP.LLClientView.OutPacket (OpenMetaverse.Packets.Packet packet, ThrottleOutPacketType throttlePacketType) [0x00000] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs:5244
# at OpenSim.Region.ClientStack.LindenUDP.LLClientView.SendCoarseLocationUpdate (System.Collections.Generic.List`1 users, System.Collections.Generic.List`1 CoarseLocations) [0x0012a] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs:3424
# at OpenSim.Region.Framework.Scenes.ScenePresence.SendCoarseLocationsDefault (UUID sceneId, OpenSim.Region.Framework.Scenes.ScenePresence p) [0x000fa] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2536
# at OpenSim.Region.Framework.Scenes.ScenePresence.SendCoarseLocations () [0x0000d] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2491
# at OpenSim.Region.Framework.Scenes.ScenePresence.Update () [0x00011] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/ScenePresence.cs:2404
# at OpenSim.Region.Framework.Scenes.SceneGraph.UpdateEntities () [0x0001b] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/SceneGraph.cs:164
# at OpenSim.Region.Framework.Scenes.Scene.Update () [0x000dc] in /home/grid/PLAZA/wrightplaza/opensim/OpenSim/Region/Framework/Scenes/Scene.cs:1031 On Region: Wright Plaza
2009-10-09 14:25:01 -07:00
8231cb2231
Putting this to exactly what it was yesterday around this time, so we can do the 100-ppl load test in WP. We need to carefully play with this code in order to understand all the problems.
2009-10-09 11:32:53 -07:00
527c94825b
Merge branch 'master' into htb-throttle
2009-10-09 17:23:18 +01:00
f1f239758f
Apply http://opensimulator.org/mantis/view.php?id=4066
...
If XEngine compile fails, show script name in error message in-world as well as the exception itself
Thanks Luca Peck
2009-10-09 17:43:25 +01:00
b6678faf34
* Apply http://opensimulator.org/mantis/view.php?id=3933
...
* Remove client servers when regions are closed or removed
* Thanks randomhuman!
2009-10-09 17:28:16 +01:00
23586b69a1
Slow down the packet receiving code again after new reports of thread storms.
2009-10-09 12:17:55 +01:00
77e48a6725
Change the backup thread to run on a BackgroundWorker instead of a Thread. I don't have an explanation, but this seems to stop a slow but steady memory leak I was experiencing
2009-10-09 02:49:55 -07:00
76a5cae0b4
Forgot to initialize m_writeLock
2009-10-09 02:18:25 -07:00
a3e31cdeaf
Added more debugging output to the "unrecognized source" warning
2009-10-09 02:13:21 -07:00
494a1e922d
Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet
2009-10-09 02:10:53 -07:00
a5b9971fd7
* Added a lock object for the write functions in LLUDPClientCollection (immutable != concurrent write safety)
...
* Allow the UDP server to bind to a user-specified port again
* Updated to a newer version of OpenSimUDPBase that streamlines the code even more. This also reintroduces the highly concurrent packet handling which needs more testing
2009-10-09 01:53:06 -07:00
56a27c37d3
Simplified LLUDPClientCollection from three collections down to one. This will prevent any potential problems from inconsistency between the internal collections
2009-10-08 21:51:53 -07:00
3a04d706c9
Fear the lockless LLUDP implementation!
2009-10-08 17:34:51 -07:00
51ea39199b
Putting the lock back in TryGetValue.
2009-10-08 15:42:08 -07:00
a0dd9f4bb4
Fork UDPBase from libOMV into opensim
2009-10-08 22:25:14 +01:00
fc41f2e461
Added guards against the exception reported:
...
#2009-10-08 12:58:34,462 ERROR - OpenSim.Application [APPLICATION]:
#APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs
#
#Exception: System.Exception: Object reference not set to an instance of an object. ---> System.NullReferenceException: Object reference not set to an instance of an object.
# at OpenSim.Region.ClientStack.LindenUDP.J2KImage.SendFirstPacket(LLClientView client) in c:\Opensim\OpenSim\Region\ClientStack\LindenUDP\J2KImage.cs:line 230
# at OpenSim.Region.ClientStack.LindenUDP.J2KImage.SendPackets(LLClientView client, Int32 maxpack) in c:\Opensim\OpenSim\Region\ClientStack\LindenUDP\J2KImage.cs:line 84
2009-10-08 07:55:06 -07:00
f6b8bac0fa
Merge branch 'master' into vehicles
2009-10-08 10:32:15 +01:00
68961ec092
One last attempt at tunning the locking/no locking behaviour. The previous one was too lax and made the important login packets fail.
2009-10-07 20:36:24 -07:00
dd80380df5
Another go at the deadlock: not locking TryGetValue, and just catch/ignore exceptions.
2009-10-07 19:45:57 -07:00
c71b3e730d
Changed the locking mechanism, because the existing one is causing deadlocks to occur.
2009-10-07 18:54:08 -07:00
d06c7d90a1
Correct a build break caused by an optimization in trunk
2009-10-07 06:56:00 +01:00
a52f6c56b1
Merge branch 'master' into htb-throttle
2009-10-07 05:19:20 +01:00
d344ca932d
A small change in FetchInventoryDescendantsCAPS.
2009-10-06 22:19:20 -07:00
8c255b374a
Uncommented log message on CAPs FetchInventoryDescendants
2009-10-06 21:32:15 -07:00
d33b6fef2b
replace LLClientView with proper version
2009-10-07 04:37:12 +01:00
adc208e568
Replace LLClientView on the branch with master. UNCOMPILABLE!
2009-10-07 04:36:36 +01:00
58c33fbc89
Uncommented log message on CAPs FetchInventoryDescendants
2009-10-07 04:32:35 +01:00
b5b53dd3eb
* One more debug message on FetchInventoryDescendants
...
* More streams close on finally
2009-10-06 19:55:35 -07:00
6f2d183107
Merge branch 'master' into htb-throttle
2009-10-07 03:01:11 +01:00
89d23a1fa2
Revert "Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed."
...
This reverts commit e992ca0255
2009-10-07 01:45:49 +01:00
9618c196c2
Revert "Merging in diva's locking fixes"
...
This reverts commit 832cc68513
2009-10-07 01:44:36 +01:00
312438f145
Commented noisy debugging about packet splitting
2009-10-06 15:55:39 -07:00
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
7199976d48
Checks the number of ThreadPool and IOCP threads on startup and bumps up the numbers to .NET defaults of 500/1000 if need be
2009-10-06 15:51:56 -07:00
e992ca0255
Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed.
2009-10-06 15:39:53 -07:00
9cb5db3621
Applying the real fix (thank you for tracking that MSDN doc down Melanie)
2009-10-06 15:08:09 -07:00
74fe284a20
Trying Melanie's fix
2009-10-06 14:50:46 -07:00
eb205ef4f0
Added a debug line for nebadon
2009-10-06 14:07:04 -07:00
25676ac5cf
* Added a sanity check for Mono before trying to enumerate over an empty SortedDictionary
...
* Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
2009-10-06 13:39:10 -07:00
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
61b5372153
* Added missing references to prebuild.xml and commented out the LindenUDP tests until a new test harness is written
...
* Clients are no longer disconnected when a packet handler crashes. We'll see how this works out in practice
* Added documentation and cleanup, getting ready for the first public push
* Deleted an old LLUDP file
2009-10-06 12:13:16 -07:00
77b4abaa25
* Removed verbose debug message
...
* Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers
* Fixed a stupid bug in the InventoryConnector which was making move items do things twice
2009-10-06 11:08:11 -07:00
fb19d1ca0a
* Try/catch around EndInvoke() when Util.FireAndForget() returns to catch exceptions thrown in the async method
...
* Added packet stats handling to the new LLUDP implementation
* Attempting to avoid a race condition when creating a new LLUDPClient
2009-10-06 10:12:59 -07:00
3db4d38645
Removing dependencies on System.Runtime.Remoting.
2009-10-06 09:54:15 -07:00
0374f1b144
Merge branch 'master' into vehicles
2009-10-06 17:44:59 +01:00
40d0018d66
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-06 15:29:46 +01:00
d4d060b57d
Commenting the DEBUG code that I added yesterday, because it's causing mono to fail with
...
https://bugzilla.novell.com/show_bug.cgi?id=538854
2009-10-06 07:49:05 -07:00
2a060136bd
Lock the heartbeat against multiple invocations. May prevent deadlocks and/or
...
runaway thread use
2009-10-06 15:28:38 +01:00
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
e7c877407f
* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
...
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
2009-10-06 02:38:00 -07:00
0c46df973a
Correction on the DEBUG code.
2009-10-05 21:02:10 -07:00
e36a54ee2a
#if DEBBUG code for monitoring the ThreadPool.
2009-10-05 20:39:23 -07:00
7ddb6fbced
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-05 17:38:27 -07:00
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
f4726f4bcc
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:52:07 +01:00
90d1ef9e4a
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:52:01 +01:00
d4a6d9191a
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:47:00 +01:00
544675d0f0
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:47:00 +01:00
05c1ec7faf
Changed the lock object, to see if this helps at all. Also switched the order of lock and try/catch in RemoveImageFromQueue.
2009-10-05 11:01:45 -07:00
2a19187e01
* minor: tweak asset cache logging levels downwards
2009-10-05 18:32:19 +01:00
10c4b88ccf
minor: remove mono compile warning
2009-10-05 18:20:37 +01:00
ad81b453b3
GetRegionByPosition: use the cache, Luke.
2009-10-05 09:02:52 -07:00
8d5a40aad0
Merge branch 'master' into vehicles
2009-10-05 12:58:52 +01:00
6d52974c5f
Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions.
2009-10-05 12:45:41 +01:00
dcdcbb314e
Fix build break
2009-10-05 11:08:02 +01:00
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
5c593f3892
only cache mesh if meshing was successful
...
re-enable sculpt mesh caching
2009-10-04 20:01:44 -07:00
362e94a022
* KeepAlive set to false in expect_user and log_off.
...
* Check for null SP in PermissionsModule.
2009-10-04 16:30:12 -07:00
Melanie