5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +00:00
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
135b012bbd
Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
...
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05:00
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
9d0339e8f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 16:04:46 -08:00
a4309578e2
Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
2010-12-14 16:04:28 -08:00
3643be1c97
Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents
2010-12-14 23:46:02 +00:00
92727ad596
minor: disable debug logging for previous test
2010-12-14 23:41:36 +00:00
8a5f9b91de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 23:39:21 +00:00
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
ff8ff773e7
Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag
2010-12-14 12:58:32 -08:00
10ae5454cb
Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time.
2010-12-14 12:16:51 -08:00
55e04e6c68
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
2010-12-14 08:11:49 -08:00
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00
4bdba0a487
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 21:36:08 -08:00
b41164b620
This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
2010-12-13 21:35:40 -08:00
e08da02a0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 00:12:17 +00:00
e62b3dba8a
reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code
...
There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
2010-12-14 00:11:41 +00:00
2a9f095071
Fix a small bug in ban list handling
2010-12-13 22:14:34 +00:00
9bd7f3b03a
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
d6803e6448
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 20:28:14 +00:00
6b8d01d8c4
It turns out that the 1/2 sec burst for prims download is not a bug, but a feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid.
...
Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond."
This reverts commit 870bbcfc6c
2010-12-13 11:45:17 -08:00
fe6c655f70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 09:43:54 -08:00
870bbcfc6c
This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond.
2010-12-13 09:42:27 -08:00
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
4d16ecf889
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-11 17:07:08 -08:00
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
69538d14d4
More OSSL function name normalization, this time for osParcelSetDetails.
2010-12-11 11:41:45 +01:00
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
2010-12-10 23:32:50 -08:00
18b10fab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 23:16:47 -08:00
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08:00
b46de6e025
Remove the restriction that you have to be logged in when loading/saving iars
...
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
b512ecd1dc
Normalization of OSSL function names.
...
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor
The functions that do not comply to the standard give a warning when used but work normally otherwise.
The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".
The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
2010-12-10 12:40:12 -08:00
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
5246d98b8d
Stop LLUDPServer sending updates after object deletes by always queueing deletes
...
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
26569a7cd0
minor: add some method doc
2010-12-02 02:01:01 +00:00
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
04ce7de5ed
Fix the build break
2010-11-29 01:15:30 +00:00
5aeb83125a
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:30:55 +00:00
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
d71d4f96e3
Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW
2010-11-27 10:59:14 +01:00
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
a8a8fb6e13
llVecNorm nant test
2010-11-27 01:29:55 +00:00
e0866faacc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-27 01:27:46 +00:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
8d79a39d5b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-23 04:27:06 +00:00
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
bbc291dfdf
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
2010-11-22 23:07:30 +00:00
34b13a4765
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
2010-11-22 22:54:13 +00:00
e1c72cedb3
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
...
This event used to trigger only when the scale was changed with a script.
2010-11-22 19:38:44 +01:00
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
8466ada8e0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-22 00:46:37 +00:00
0fec29c849
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-21 17:19:45 -08:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
f1151f20dc
Fix global region coordinates that are delivered by llRequestSimulatorData.
...
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
f49e32bfaa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-20 02:34:27 +00:00
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
8f1a79420b
Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
af0deff7e9
Make "show queues [full]" behave like "show users [full]"
...
Now, "show queues" only shows root agents. "show queues full" will show child agents as well
2010-11-17 22:55:20 +00:00
c4f3175e17
add "Unacked bytes" column to "show queues"
...
This should show the number of bytes sent to the client that it has not yet acknowledged.
2010-11-17 22:55:19 +00:00
2a17c39dfe
Fix "show queues" console command
...
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
2010-11-17 22:55:19 +00:00
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +00:00
0d72d77629
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-17 18:20:41 +00:00
43c270b536
Fix gesture and viewer preview sounds not playing
2010-11-17 18:20:24 +00:00
393c9c9046
Add osUnixTimeToTimestamp()
...
This allows an input unix time to be converted to an llGetTimeStamp() format.
Thanks Thomax.
2010-11-17 01:45:47 +00:00
390c3a3b6f
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:18:35 +00:00
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
56bd42b438
Fix osTeleportAgent for hypergrid destinations.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 15:23:45 +00:00
50202bab7c
Add osTeleportOwner.
...
This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map.
The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access.
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 13:43:27 +00:00
e7e3c74fb7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-16 10:22:15 +00:00
5329e3b9b7
Can't detach an object from within the script thread because it will throw. Use FireAndForget for that.
2010-11-16 01:36:26 +00:00
98ba079e95
Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory.
2010-11-16 01:35:16 +00:00
1e7334d985
provide avatar name in log if an exception ends up at the top of an async packet processing stack
2010-11-12 23:20:07 +00:00
00b0f521fa
Add PARCEL_DETAILS_ID to LSL
2010-11-12 01:16:14 +00:00
bfc128529c
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:20:19 +00:00
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +00:00
6056ae8d88
Fix merge artefacts
2010-11-08 02:58:33 +00:00
18b27408d6
Prevent plants from being treated like dropped attachments and removed
...
from the sim.
2010-11-08 02:39:06 +00:00
4f6dd8bda3
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
2f58d56137
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-11-08 02:37:28 +00:00
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
2317b6767b
Add a method to delete left over / dropped attachments
2010-11-08 02:36:51 +00:00
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
6c3b7617b0
Add lsClearWindlightScene() to the lightshare module to remove WL settings
...
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
2010-11-03 02:04:17 +00:00
57eabe9d46
Actually calculate the height before setting it, this isn't done automatically
...
on incoming transfers in all cases.
2010-11-03 00:47:22 +00:00
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
78a0ed3ff9
Fix sitting and standing up
2010-11-02 21:28:24 +00:00
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
ed7959ddfb
Thanks Snoopy for a patch that addresses Mantis #0005165 : osSetDynamicTextureURL crashed region server
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-11-02 02:35:56 -07:00
12d61d1ef5
Merge branch 'master' into mantis5110
2010-10-31 20:50:39 -04:00
f15f0ab59b
Removed a couple of very verbose debug messages.
2010-10-31 12:11:30 -07:00
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
623cee1ffc
Move physics actor creation to after SetHeight to try and prevent
...
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
09bf9d5fca
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
2010-10-30 02:26:48 -04:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
f9227977f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-30 03:07:45 +01:00
45220a6954
minor: remove some old commented out code
2010-10-30 03:01:40 +01:00
343c894658
Set async_packet_handling = true by default
...
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
ade71c9ed7
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
2010-10-30 01:32:56 +01:00
46362cd1c0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:58 +01:00
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
09705514ff
tweak a few more scene presence logging messages for consistency
2010-10-29 23:52:25 +01:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
25e19ba7e9
add timing report to CompleteScenePresence for diagnostic purposes
2010-10-29 23:03:11 +01:00
bcd784b316
for now, comment out some older or redundant log debug lines to make diagnostics easier
2010-10-29 21:49:26 +01:00
f19816aeb9
Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics
2010-10-29 21:38:26 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
49fa7e91b9
Clean up some cruft from the last commit. Re-add the initial update
...
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
2010-10-29 20:17:59 +01:00
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
9132e251aa
Made the check for texture assets asynchronous. This is one part of
...
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
627d1a42fe
Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object.
2010-10-23 20:39:41 -07:00
80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
2010-10-22 23:35:01 +01:00
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
2010-10-22 23:34:53 +01:00
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
2010-10-22 23:34:44 +01:00
cddcb53b17
Revert "* remove some spurious debug info"
...
This reverts commit 017b83d0a3
2010-10-22 23:34:37 +01:00
d58967be58
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 18:33:59 -04:00
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
607c07b4aa
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 18:33:41 -04:00
772dbf59f3
slightly simplify oar control file loading code
2010-10-22 18:33:35 -04:00
460b9fffe5
write IAR control file first in the archive rather than last
2010-10-22 18:33:32 -04:00
e06acae965
Allow region modules to know which agents actually receive chat
2010-10-22 18:33:19 -04:00
481a44104e
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-22 18:33:10 -04:00
004b395d12
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-22 18:27:49 -04:00
170c5d183b
Remove a bit of dead code relating to ObjectCapacity
2010-10-22 18:27:40 -04:00
753137e9ad
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-22 18:27:28 -04:00
6049e548a5
Skip empty strings in ParseString* functions
2010-10-22 18:27:12 -04:00
700f4ddea4
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 22:55:07 +01:00
cfbaad3669
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 21:28:10 +01:00
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
199b61f1b2
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
e7f184345e
minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable
2010-10-22 01:52:19 +01:00
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
529fb58b7b
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -07:00
fe99f194ad
Deleted a verbose and unneeded log message.
2010-10-21 12:00:30 -07:00
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01:00
f8a47801ee
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-20 20:43:08 -07:00
9038218c2d
fix combining of multiple physics submeshes
2010-10-20 20:39:05 -07:00
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
335f2ddad2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 20:26:37 -04:00
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
a7acb650d4
Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours.
2010-10-19 22:26:07 -07:00
9f975ad5aa
* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
2010-10-20 01:23:54 -04:00
087cb951e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 00:43:29 -04:00
edce4e9c67
* This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool.
2010-10-20 00:40:05 -04:00
8731c2be11
It looks like Vector3s also got written down in lower case at some point in time. Added code to account for that.
...
17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838.
2010-10-19 15:16:29 -07:00
8acac3d07f
Another take related to the previous commit.
2010-10-19 15:07:15 -07:00
3b2d9a9939
Added code to quaternion deserialization to try to cope with an exception seen in Wright Plaza related to SitTargetOrientation.
...
17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064.
2010-10-19 14:37:03 -07:00
684449f783
Added TextureAnimation and ParticleSystem to serialization.
2010-10-19 00:04:02 -07:00
b2c1a1c9bd
* This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization.
...
* You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
2010-10-19 01:53:56 -04:00
158e43d4fd
* Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment.
2010-10-18 23:47:35 -04:00
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
37a6be7ca9
Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it.
2010-10-19 02:20:47 +01:00
5dd372edc4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:12:36 +01:00
99388ce610
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:08:50 +01:00
478b44f231
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
...
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
b9bef50852
Display more information when xmlrpcgroupsserver comms fails
...
Improve debugging messages
2010-10-19 02:04:14 +01:00
43a4b7b735
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:23:25 +01:00
5b29b975ee
Comment a spammy debug message in the serializer
2010-10-19 00:51:04 +01:00
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
6df4ca7de1
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-17 10:42:04 -07:00
7038f2b406
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
2010-10-17 10:41:38 -07:00
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
06b61b68c7
Adding osFunctions for light projection
...
Set the projection parameters in the host prim ...
osSetProjectionParam(bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Set the projection parameters in a target prim ...
osSetProjectionParam(ikey target uuid,
bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Threat Level very high
Signed-off-by: Melanie <melanie@t-data.com>
2010-10-17 09:52:12 +01:00
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
edc31adf95
Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all
...
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16 07:09:13 +01:00
e41b23a1a4
change --old-guids switch on the save oar command line to --version=<x>
...
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
2010-10-16 05:38:44 +01:00
3df8d8ff76
Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle
2010-10-16 04:59:51 +01:00
1bd4219078
save oar control file first rather than in the middle so that it's the first thing we come accross on load
...
this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now
2010-10-16 03:52:11 +01:00
fe4e6ff811
Fix test break - TestSerializeXml2() still requires old-guids option
2010-10-16 02:38:46 +01:00
1499607215
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-10-15 17:27:19 -07:00
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:56:08 -04:00
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
41ce392d9b
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
2010-10-14 09:05:46 -07:00
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
6d99f0c627
* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'
...
* At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
2010-10-14 09:34:37 -04:00
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
d890390ecf
Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements.
2010-10-13 10:38:34 -07:00
54a3b8e079
New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet.
2010-10-13 08:16:41 -07:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
30f926aab6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-10 22:07:51 +01:00
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
4a0911bdbd
Guard against locking a nullref to avoid build break
2010-10-08 19:19:07 +01:00
5dcbbb726a
Change the order of actions to address a possible nullref
2010-10-08 18:40:13 +01:00
4adada6fe4
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-07 23:47:39 -04:00
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
9a5d0984a5
Fix autoreturn to not return zero objects
2010-10-07 02:16:36 +01:00
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
9a1c8db443
Convert worldview to GET
2010-10-06 05:17:31 +01:00
623f57deb5
Change the URL /worldview to /worldview/<region id> to support multiregion
2010-10-06 03:51:55 +01:00
752b6a8764
Convert the BMP to a JPEG image and return it. This should be testable.
2010-10-06 03:40:55 +01:00
abfcd168fc
Add the parameter plumbing and image generation
2010-10-06 03:32:01 +01:00
17316170a5
Add WOrldView request handler and plumbing
2010-10-06 03:03:10 +01:00
7d62ab6a9e
Fix incorrect class name
2010-10-06 02:16:42 +01:00
ce89f08f6b
Add WorldView module skeleton
2010-10-06 02:06:50 +01:00
c97398575c
Convert the map image modules to new style modules
2010-10-06 01:42:18 +01:00
593fc5c87a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 19:45:37 -04:00
5d61323192
Add the view generating method to the image generator interface
2010-10-05 23:49:21 +01:00
b424af6187
Revert an accidental default value change
2010-10-05 23:06:29 +01:00
eb491d2c36
Patch to allow other cam angles. Not complete. Thanks, Antont.
2010-10-05 22:56:20 +01:00
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
ba0a19c228
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 02:12:35 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
eb17d581d3
Make windlight set the default environment on start
2010-10-05 01:54:15 +01:00
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
2010-10-03 20:01:59 -07:00
f89dd85f68
Fix a comment marker
2010-10-04 00:17:48 +01:00
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
511751a733
I really have to say it again and again: e.Message is NOT enough data for
...
troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must
be used.
Fix one more instance of that cr.p
2010-10-03 22:36:27 +01:00
189cda1c3d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-03 16:51:41 +01:00
4f70ac018b
Adapt to core changes
2010-10-03 16:40:11 +01:00
27340f616e
Addign the new / renamed files for previous commit
2010-10-03 16:34:55 +01:00
ab4be3ffdf
Initial port of the Warp3D map tile renderer
2010-10-03 16:34:17 +01:00
0133619af2
Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.
2010-10-02 17:02:02 -07:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
6fc1ceb2ee
So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not.
2010-10-02 20:11:43 +01:00
87c6386884
Reapplying the parts of the prior revert that were not derived from the
...
original patch
2010-10-02 18:47:26 +01:00
b01020b84a
Revert "Forward-port 0.6 fix"
...
This reverts commit 90b51dc7d6
2010-10-02 18:45:48 +01:00
f220a2c5eb
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:24:16 +01:00
eb58d91098
Prevent dropping someone else's attachments
2010-09-30 15:57:52 +01:00
90b51dc7d6
Forward-port 0.6 fix
2010-09-30 15:52:33 +01:00
29646bcf67
Fix an inventory fetch issue
2010-09-30 02:52:35 +01:00
1255c7ceb6
Cleanup: Removed an unreferenced variable from ActivityDetector.cs
2010-09-29 14:39:13 -07:00
b6e0563ad7
Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior
2010-09-29 14:34:02 -07:00
9b7c99f0cf
Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now
2010-09-29 14:24:32 -07:00
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
8e547d3491
Prevent setting arbitrary groups on your objects.
2010-09-27 02:11:55 +01:00
c2a4bdb2fe
Fix build break
2010-09-27 01:40:29 +01:00
84ab4742c8
Quash the region ID on intersim messages. That prevents people from determining
...
another avatars location
2010-09-27 01:31:17 +01:00
aaa4cb64a4
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-27 00:34:30 +01:00
1f7d68e555
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:30:26 +01:00
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
dc49057c8a
Consistency patch: use Path.Combine() instead of + and eliminate the need
...
for a trailing slash on exports/
2010-09-26 20:03:00 +01:00
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
Adding ability to place script engine assemblies outside
the codebase directories.
Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"
Signed-off-by: Melanie <melanie@t-data.com>
2010-09-26 02:30:46 +01:00
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
6325fa515d
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
...
If a separate UUID parameter is better for the future then this can be added later on.
2010-09-25 00:51:40 +01:00
b366ad5012
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-25 00:00:00 +01:00
5bcf9ae2f9
If the uuid gatherer fails to find the asset containing gesture metadata, then simply return rather than generating an exception
...
This matches existing behaviour, though better diagnostics for missing assets may be good later on.
This addresses http://opensimulator.org/mantis/view.php?id=4977
2010-09-24 23:58:37 +01:00
8dc59f5b59
Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functions per the LSL wiki.
...
Signed-off-by: Melanie <melanie@t-data.com>
This patch also fixes a large amount of trailing whitespace. While this is
beneficial, it should really be in a separate patch that fixes whitespace only.
Just good practice.
2010-09-24 16:25:14 +01:00
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
192bcab987
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:01:07 +01:00
a85779e477
If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the scene, remove the old uuid reference from m_parts as well as adding the new one.
...
The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene)
Added unit test for this behaviour.
Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
2010-09-21 00:58:54 +01:00
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
889923841c
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
...
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
2010-09-18 01:43:22 +01:00
b1ab3ea5d9
For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
...
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
c08b6c2873
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 14:35:35 -07:00
e603521fd7
Applying the llParseString2List() patch from #5036 that Melanie claims was already applied
2010-09-17 14:32:49 -07:00
256c8cb62d
Send kill packets for avatars, too
2010-09-17 03:56:31 +01:00
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:57:26 +01:00
b49cb3355f
Fixed a regression in SOG.Copy()
2010-09-16 17:57:00 -07:00
5321e0e69f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-16 17:31:24 -07:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
e3f1533705
Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}
2010-09-17 01:21:28 +01:00
5072429263
Send KillPackets on the Task queue rather than the State queue
...
Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along.
The kill packet would then be placed on the state queue and possibly get sent before the update
If the update gets sent afterwards then client get undeletable no owner objects until relog
Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue
Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist.
2010-09-17 01:16:21 +01:00
670357367e
Removing debug
2010-09-16 23:32:18 +01:00
1b2edfe75f
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
7383173d3d
extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() to reduce scope for kill/update race conditions
...
This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update
This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged
Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks
However, evidence suggests that there is still a kill/update race somewhere
2010-09-15 23:06:38 +01:00
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
16f296f489
Instead of locking SOG.Children when a group is being removed from the scene, iterate over an unlocked list instead
...
Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView
At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on
Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either
2010-09-15 21:51:13 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
36f81c66e5
Comment out SOG storing debug log message
...
This can get very spammy with regularly changing objects. Please uncomment if required.
2010-09-14 00:05:38 +01:00
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
4aadfc3007
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:27:56 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
dd803b4f0c
minor: Add comments which explain what's going on wrt avatar movements at various points in the main scene loop and associated methods
2010-09-13 21:53:25 +01:00
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
220f82a0f0
Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/)
...
Also convert some tabs into spaces.
2010-09-11 00:27:52 +01:00
30306a775a
Made it impossible to create a user with names containing spaces and prevented passwords from being echoed after enter is pressed.
2010-09-10 23:19:18 +01:00
b597a295c4
Second pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:41:36 -07:00
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
ae6682036d
Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only.
2010-09-08 14:13:01 -07:00
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
8fda08d858
Make sure unlinked child prims get persisted
2010-09-07 11:48:28 +01:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
84ad9e4d4e
minor: comment out some excessive test logging
2010-09-07 02:05:44 +01:00
90cd035693
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 02:01:38 +01:00
99bfb0d2a2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-07 01:45:08 +01:00
3d033520fa
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:43:20 +01:00
11f4a65f42
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:12:06 +01:00
e55f6d47e9
Add test that checks correct persistence when an unlink is quickly followed by deletion of a linked part
...
This test is temporarily not running since it currently fails due to a bug in this area
2010-09-06 23:28:52 +01:00
ab875b32c1
Make console backup command do a forced backup rather than non-forced
...
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
2010-09-06 23:12:03 +01:00
537fefa3f2
extend TestNewSceneObjectLinkPersistence() to check for presence of non-root linked prim
2010-09-06 23:06:23 +01:00
953b7f4917
Add test to check persistence of newly added pre-linked objects
...
Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate
NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead.
2010-09-06 23:00:24 +01:00
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
0246edc2ea
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
64ec14c8c4
Add missing IDwellModule interface
2010-09-05 17:08:57 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
68f107b27e
Logout the presence if client IP verification fails.
2010-09-04 18:46:27 -07:00
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
71c0fc10df
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 21:14:23 +01:00
8daea4d7c0
llRot2Euler Tests
2010-09-03 21:11:13 +01:00
17a26c3701
Fix an issue with rezzing scripted objects.
2010-09-03 03:27:26 +01:00
1c8bc9b7b6
Remove commented code and the comment, as the change has proven out
2010-09-02 21:02:09 +01:00
7720419fc7
Experimentally comment the sending of unbaked avatars
2010-09-02 20:17:49 +01:00
ed72396d9b
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:59:12 +01:00
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
c947a67b23
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-01 00:17:23 +01:00
c47de94263
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:36:46 +01:00
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
9c1c378aa1
Add ScenePresence.GetAttachments(uint attachmentPoint)
2010-08-31 22:16:23 +01:00
b8c58e5f9f
reinsert functionality to debug log more levels of incoming and outgoing client protocol packets
...
These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets)
This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
2010-08-31 18:27:10 +01:00
dd14c539af
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-30 21:24:08 +01:00
3cd7761d65
Report exception message as well as stack trace if a region fails to register with the grid service in grid mode
2010-08-30 21:23:19 +01:00
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
374807d194
Replace hardcoded 0 with KickFlags provided by the client.
...
This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
2010-08-28 02:45:28 +01:00
83fbf66444
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-28 02:41:00 +01:00
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
0f95cd209e
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
2010-08-27 17:25:04 -07:00
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
b4278510f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-27 22:53:02 +01:00
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
1f1d72eba5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-26 23:39:20 +01:00
5b4e0b72bc
Send a null result search packet when no results are passsed in
2010-08-26 23:38:35 +01:00
436fdc2ea8
More on mantis #4985
2010-08-26 14:48:29 -07:00
6198fe53e6
Addresses mantis #4985 -- exceptions in DataSnapshot
2010-08-26 14:19:52 -07:00
fb6d761e19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-26 22:13:46 +01:00
7f5501d3ab
minor: remove mono compiler warning
2010-08-26 22:13:31 +01:00
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
26fd673e20
Addresses mantis #4984 -- Datasnapshot exceptions.
2010-08-26 12:26:09 -07:00
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
d99c60164d
Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.
...
On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
2010-08-26 16:06:34 +01:00
a6869fbc3e
Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()
...
By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
2010-08-26 15:33:42 +01:00
87a6554d4b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
166ab59420
replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway)
2010-08-26 00:15:26 +01:00
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
604423d52b
Make scene object directories more robust and prevent deleted SOP's from
...
sticking around
2010-08-25 23:19:30 +01:00
22fd00b002
minor: remove mono compiler warning
2010-08-25 23:07:43 +01:00
24d06b12c2
If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
...
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
2010-08-25 23:05:54 +01:00
46c6c35d48
refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory
2010-08-25 22:46:49 +01:00
d69e992665
Split out actual scene object insertion code from Scene.Inventory.RezObject and move into SceneGraph.AddNewSceneObject()
...
The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages.
This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module
This code does not touch direct rez by a user
2010-08-24 23:25:19 +01:00
78f452050a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-24 22:29:32 +01:00
07d5a0779a
refactor: make RezObject() more readable
2010-08-24 20:53:25 +01:00
a7a45cb22c
Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.
...
This fixes Mantis #3923 .
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-24 19:19:26 +01:00
46d06b6c4c
add test to check move of task item to user inventory when a target folder is explicitly given
2010-08-24 17:10:52 +01:00
8bb073d99a
minor: stop test using obsolete property
2010-08-24 17:06:04 +01:00
35f719ae2f
refactor TestMoveTaskInventoryItemNoParent()
2010-08-24 17:04:54 +01:00
289c21099c
Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
...
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
de85aabcbe
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
c72d298202
Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.
2010-08-23 23:25:36 +01:00
1d01c91095
minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs
2010-08-23 23:21:44 +01:00
Melanie