Diva Canto
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
Diva Canto
08d3650138
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-10-04 14:06:28 -07:00
Diva Canto
5b19d5a7b7
Reduced locking.
2009-10-04 14:05:58 -07:00
John Hurliman
29a4614529
* MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData
...
* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)
2009-10-04 13:57:51 -07:00
Diva Canto
d93e0a0503
Guarding a line that is sometimes throwing a null pointer exception.
2009-10-04 10:30:21 -07:00
Diva Canto
fe9cca64de
Stream needs to be closed before the file can be moved...
2009-10-04 09:56:54 -07:00
Diva Canto
b803d5ab9b
Make sure to close the file streams on the FlotsamCache, even if something fails.
2009-10-04 09:44:04 -07:00
Diva Canto
366bfe17ae
Trying to avoid the null pointer exception in J2KImage, RunUpdate.
2009-10-04 07:41:10 -07:00
dahlia
95ebb7794c
flexible extrusion shape defaults to linear
2009-10-04 02:59:12 -07:00
dahlia
efebc809ce
disable physics actors for flexible prims
2009-10-04 02:54:36 -07:00
dahlia
0cbd9eee2f
Exclude sculpt proxies from mesh caching
2009-10-04 02:14:13 -07:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
Melanie
874e423141
Fix my build break
2009-10-03 15:37:31 +01:00
Melanie
b4d1cf0009
Small permissions tweak
2009-10-03 14:22:29 +01:00
John Hurliman
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
John Hurliman
332d3eb1bb
* Removed code that is no longer used with Melanie's queue callback optimization
...
* Moved all priority queue access to helper functions to improve reliability and readability
* New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
2009-10-02 16:53:35 -07:00
Melanie
36c8d55827
Merge branch 'diva-textures-osgrid'
2009-10-03 00:03:09 +01:00
Melanie
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
John Hurliman
bdc1345501
* Removed even more unnecessary state variables from J2KImage
...
* Fixed the incorrect "out of memory?" exception messages and replaced them with useful information
* Cleaned up J2KImage and LLImageManager to conform to coding conventions
2009-10-02 13:08:15 -07:00
John Hurliman
9b342d3e0d
* Changed the flush logic to drop packets in non-transactional streams, and to not fire any "put more data in the queues" callbacks
...
* Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
2009-10-02 12:00:42 -07:00
Melanie
9eccea5777
Merge branch 'master' into vehicles
2009-10-02 19:53:42 +01:00
Melanie
46955f4260
Merge branch 'master' into vehicles
2009-10-02 19:04:46 +01:00
Melanie
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
Melanie
6def897556
Merge branch 'diva-textures-osgrid' into diva-textures
2009-10-02 19:02:38 +01:00
dr scofield (aka dirk husemann)
6c068eaf12
reducing script engine log spam
2009-10-02 12:38:13 +02:00
dr scofield (aka dirk husemann)
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
Melanie
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
Melanie
3ba36bb4d8
Restore the missing image handling to the image manager. The missing
...
image packet crashes Hippo without a message.
2009-10-02 05:49:27 +01:00
Melanie
9a429610e2
Merge branch 'diva-textures-osgrid' into texturetest
2009-10-02 04:19:22 +01:00
Diva Canto
746dad7b74
Locking the priority queue to see if it gets pass that exception.
2009-10-01 20:32:22 -07:00
Melanie
18a744cac1
Change texture sending to be driven by the queue empty event from the
...
packet queue, rather than a timer
2009-10-02 04:04:14 +01:00
John Hurliman
54ff84050f
Removing console debug spew
2009-10-01 18:12:13 -07:00
Adam Frisby
a2cdbd784d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-02 10:54:01 +10:00
John Hurliman
aaf8fbcef9
Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
2009-10-01 17:53:28 -07:00
Adam Frisby
a030e3d61b
* Attempting to fix a issue with console commands & the estate module. Again.
2009-10-02 10:53:21 +10:00
John Hurliman
6e0c79b8fe
* Rewrote LLImageManager to use a real priority queue and hold minimal state
...
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
2009-10-01 17:42:13 -07:00
Diva Canto
24d5b57503
Added messages to assertions in the failing tests, so that we know which ones are failing.
2009-10-01 17:28:42 -07:00
Melanie
212e132e79
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
...
This reverts commit 39842eb4af
.
2009-10-02 00:47:01 +01:00
Melanie
4a1076128c
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-10-02 00:45:43 +01:00
Melanie
d6301db382
Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
...
This reverts commit 39842eb4af
.
2009-10-02 00:45:31 +01:00
Melanie
54a912bb9c
Add a method to determine the count of packets in a throttle
2009-10-01 22:35:57 +01:00
Melanie
5e9da4daab
Add OnQueueEmpty event to the packet layers. No user functinality yet
2009-10-01 21:08:17 +01:00
Melanie
d0cc0985fa
Fix a merge conflict
2009-10-01 14:45:06 +01:00
Melanie
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
James J Greensky
44776fea72
Fixing LLClientView memory leak
...
Fixing LLClientView memory leak by disposing of all timers utilized
in LLClientView as they contain references to the callback method.
This required the use of the Terminate and Close infrastructure that
was already in place but was not being utilized.
2009-10-01 04:11:32 +01:00
Diva Canto
1eb6f99d19
Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.
2009-09-30 20:27:40 -07:00
James J Greensky
8e3dd64282
Removed an innefficent List.Contains lookup from UpdateQueue
...
Changed the underlying data structure used to detected duplicate
in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a
List to a Dictionary.
2009-09-30 17:53:32 -07:00
John Hurliman
cb26878f96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 17:51:34 -07:00
Jeff Ames
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
John Hurliman
5dfd2643df
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
...
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
2009-09-30 15:53:03 -07:00
John Hurliman
acfe2d9f4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 15:28:23 -07:00
Melanie
041aaaa62c
Prevent null data being sent to the decoder
2009-09-30 22:21:22 +01:00
Melanie
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
Melanie
67fefdb5a0
Remove predecode-j2k and it's assoaciated logic
2009-09-30 21:33:00 +01:00
Melanie
b0c0d6f9d1
Squelch the debug noise from diva's patch
2009-09-30 20:36:20 +01:00
John Hurliman
f56dc5fcda
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
...
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
2009-09-30 19:26:53 +01:00
Melanie
f908e32f62
Revert "Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug"
...
This reverts commit 22cc31135e
.
2009-09-30 19:26:26 +01:00
John Hurliman
22cc31135e
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug
...
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
2009-09-30 18:42:45 +01:00
Diva Canto
4bf47fa592
This releases the texture assets from LLImageManager cache, and re-requests them later if the client asks for them again. Needs more testing in texture-rich sims.
2009-09-30 18:41:41 +01:00
Kitto Flora
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02:00
Kitto Flora
d43f739cef
And another merge issue
2009-09-30 19:05:39 +02:00
Kitto Flora
11750a272e
And another
2009-09-30 19:04:06 +02:00
Kitto Flora
6b65eb76d0
Another small change to avoid later merge conflict
2009-09-30 19:01:55 +02:00
Kitto Flora
53fbc970ca
Small chaneg to adapt to trunk
2009-09-30 18:58:52 +02:00
opensim
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
Jeff Ames
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
Melanie
377a8b5229
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-30 11:17:27 +01:00
Melanie
94aa7e677c
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 09:12:43 +01:00
Diva Canto
89016203de
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 16:13:31 -07:00
Diva Canto
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
dr scofield (aka dirk husemann)
09cb8a594b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-09-29 17:00:02 +02:00
Diva Canto
37a8b2b8b7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 07:56:29 -07:00
Alan M Webb
2a7bedb5e9
This fix addresses the problem where phantom objects do not
...
always behave like they are phantom, and llVolumeDetect
seems to operate in a random fashion.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 16:55:03 +02:00
Diva Canto
bc892c1d4c
A little hack to see if this fixes the problems with ~20% of SOG's becoming phantom after an import to megaregions.
2009-09-29 07:54:56 -07:00
Alan M Webb
a43706862c
Given the perverse way that strided works, if
...
there is only one element in the range, it must
also coincide with the specified stride. The
existing code assumes that the stride starts at
start ( which is the expected and most useful
behavior).
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 15:40:41 +02:00
Diva Canto
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
Diva Canto
a60ed0562c
I think I have fixed something that was broken in the scene setup (tests) and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
2009-09-28 17:42:35 -07:00
Diva Canto
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
Diva Canto
4eca59ec13
Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache.
...
Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
2009-09-28 17:33:34 -07:00
Jeff Ames
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
Diva Canto
e15a9b8484
Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing the notifications of the messaging service in standalone.
2009-09-27 17:01:30 -07:00
Diva Canto
689eea3bad
Guarding the methods under if (m_Enabled)
2009-09-27 15:06:44 -07:00
Diva Canto
2432cc607e
Neighbours cache working.
2009-09-27 13:43:57 -07:00
Diva Canto
5d09c53a1a
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
2009-09-27 10:14:10 -07:00
Diva Canto
68e40a87ca
Poof! on LocalBackend. CommsManager.GridServices deleted.
2009-09-26 21:29:54 -07:00
Diva Canto
620fa2b772
Poof! on OGS1 GridServices.
2009-09-26 21:21:06 -07:00
Diva Canto
989382352d
Poof! on Region.Communications.Hypergrid. Grid code deleted.
2009-09-26 21:14:41 -07:00
Diva Canto
f4bf581b96
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
...
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
Diva Canto
dcfd08b8dd
Fixed a bug with link-region.
2009-09-26 11:01:18 -07:00
Diva Canto
b5163889b9
Fixed the order of params to GetRegionRange.
2009-09-26 10:30:45 -07:00
Diva Canto
632bb71262
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
...
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
Diva Canto
d39e67d5b2
More redirects to HGGridConnector-as-HyperlinkService.
2009-09-26 08:06:14 -07:00
Diva Canto
7253a9453e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-26 07:49:04 -07:00
Diva Canto
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
Teravus Ovares (Dan Olivares)
a7f3d01f8a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-25 16:06:40 -04:00
Teravus Ovares (Dan Olivares)
2bb513329a
* Does a full battery of tests to ensure that the object isn't an attachment before border crossing
...
* Fixes 'Inconsistent Attachment State' when teleporting into another region besides the SW most region slot on a MegaRegion.
* Fixes a host of other unintended attachment border cross edge cases that lead to Inconsistent attachment state.
2009-09-25 16:06:04 -04:00
dahlia
fb2cabd6b3
corrections to viewerMode AddPos()
2009-09-25 13:01:48 -07:00
Teravus Ovares (Dan Olivares)
0a0b532270
* Fixes teleporting within megaregions on HG enabled regions. You can teleport around now. (but it still doesn't fix the inconsistent attachment state when teleporting into region slots that are not the south west region on megaregions)
2009-09-25 15:31:19 -04:00
Justin Clark-Casey (justincc)
0bdf75637f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-25 19:19:01 +01:00
Diva Canto
eed8a61559
More small changes to FlotsamAssetCache as per mcortez' request.
2009-09-25 08:47:45 -07:00
Diva Canto
902279f0fd
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 08:39:09 -07:00
Justin Clark-Casey (justincc)
9249c026f2
Don't preserve full user profile details within iars for now
...
This information was not being used in the load process
2009-09-25 16:22:43 +01:00
Justin Clark-Casey (justincc)
613cb417c0
add control files containing version info to iars
2009-09-25 14:52:53 +01:00
Justin Clark-Casey (justincc)
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
Dan Lake
1b2828f5d8
Meshmerizer stores dictionary of unique Meshes keyed on construction parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE
...
Signed-off-by: dahlia <dahliaTrimble@gmailDotCom>
2009-09-24 18:20:59 -07:00
dahlia
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
Justin Clark-Casey (justincc)
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
Justin Clark-Casey (justincc)
e1abc3d4c4
re-enable registration of user service authentication method I accidentally disabled a few commits ago
...
load/save iar on a grid should now work, provided that the user service is this revision or newer
2009-09-24 15:22:47 +01:00
Justin Clark-Casey (justincc)
f62b5e6cec
Produce a different error message if the user service does not have the authenticate method available
2009-09-24 15:19:47 +01:00
Justin Clark-Casey (justincc)
7870152d23
Allow load/save iar password checks to be done in grid mode
...
This should allow load/save iar to work for grid mode as long as the grid user service is later than this revision
Grid services of earlier revisions will always erroneously report incorrect password. This will be addressed shortly.
2009-09-24 14:54:12 +01:00
Adam Frisby
ca69fac13e
* Send Updated Information Packet to Clients after updating estate settings.
2009-09-24 22:02:29 +10:00
Adam Frisby
8605c5d2eb
* Establishing why new console commands fail to work. >_>
2009-09-24 21:46:41 +10:00
Adam Frisby
57429423bb
* Fixing typo.
2009-09-24 21:29:57 +10:00
Adam Frisby
aca9fd182e
* Added two new commands to EstateManagementModule
...
* Also, I hate git.
2009-09-24 20:27:11 +10:00
Diva Canto
1260c81a9c
More tests. Seems to be working.
...
Grid connector modules are enabled for standalones only, but nothing in the simulator uses them yet, so it's safe to go in.
2009-09-23 20:51:04 -07:00
Diva Canto
fd8fb7735b
First test passes -- regions being registered and retrieved correctly in Data.Null.
2009-09-23 20:39:25 -07:00
Diva Canto
3c19bd5142
Unit tests for the grid service. Yey!
2009-09-23 20:35:16 -07:00
Diva Canto
67276589c8
Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
...
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
Diva Canto
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
Teravus Ovares (Dan Olivares)
c592a60f46
Fix endlines on UrlModule.cs
2009-09-23 15:00:18 -04:00
Teravus Ovares (Dan Olivares)
9c2ffa8f2e
* fix endlines in LSL_api.cs
2009-09-23 14:55:22 -04:00
Diva Canto
35deff7ec4
Modules active. Tested HGGridConnector in standalone only for now. Modules commands work.
2009-09-23 09:27:01 -07:00
Diva Canto
486a9a5b61
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 07:54:13 -07:00
Alan M Webb
b7265abfae
Added delay loop to give a newly created assembly time to appear. On
...
Linux (as an example), it is possible for the existence check to fail
because the file is not yet recognized by the file system. Although
the loop has a 250mS delay, in practise, the existence test in the for
loop is successful and no delay is introduced.
Next, this takes care of the two, unpredictable, situations where a
script fails to compile. The first is caused by an occasional SEGV in
the underlying mono VM while mcs is running, the second is caused by
file system latency.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-23 14:49:34 +02:00
Diva Canto
882d2c9cc3
Added hg console commands to the module.
...
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
Adam Frisby
5dc3e560d3
* Makes SimulatorEnable messages 'reliable' and subject to redelivery.
2009-09-23 10:30:18 +10:00
Diva Canto
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
Diva Canto
0fc2b73e7b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-22 14:15:53 -07:00
Diva Canto
34f4738159
Added HGGridConnector and related code.
2009-09-22 11:58:40 -07:00
Melanie
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
Melanie
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
Diva Canto
a9ced0fe79
Added Remote grid connector module.
2009-09-21 19:33:56 -07:00
Melanie
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
Melanie
5511c62580
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-21 18:12:12 +01:00
Diva Canto
6d0e7b6a6c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-21 11:05:20 -07:00
Diva Canto
390137d540
Added grid handler and grid remote connector.
2009-09-21 11:05:01 -07:00
Melanie
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
Melanie
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
BlueWall (James Hughes)
d835485a1f
Updatate llOpenRemoteDataChannel to provide the external hostname configured in the Regions.ini (or xml) to the XmlRpcGridRouterModule
2009-09-19 08:16:10 +01:00
Diva Canto
66f8166bd0
First pass at LocalGridServiceConnector. Nothing of this is used by the simulator yet.
2009-09-18 20:01:33 -07:00
Justin Clark-Casey (justincc)
967cbde055
correct off-by-one error in save iar command handling
2009-09-18 22:25:32 +01:00
Justin Clark-Casey (justincc)
33ea86374a
provide intelligble warning of why load/save iar doesn't work on grid mode, pending a fix
2009-09-18 22:22:00 +01:00
Michael Cortez
4eb07232e0
Group Membership information is sent out from two different locations, refactored out the filtered membership list code and used it in both locations.
2009-09-18 20:54:03 +01:00
Michael Cortez
65b9084c65
Add a little debugging for filtered groups lists based on requester
2009-09-18 20:54:01 +01:00
Michael Cortez
3b511d5138
Try to filter the groups list returns for User A, when sending to User B, based on User A's preferences for ShowInProfile.
2009-09-18 20:53:58 +01:00
Michael Cortez
247fdd1a4d
Add additional instrumentation so that when there is an xmlrpc call failure, the actual xml that was returned from the groups service can be logged.
2009-09-18 20:53:56 +01:00
Michael Cortez
841cd69af7
Remove debug messages from some areas that have been highly tested, and debug info is no longer nessesary.
2009-09-18 20:53:53 +01:00
Michael Cortez
0e07a7ef10
Adding additional debug to output the group powers specified when updating a group role. This will be used to solve some issues with the Group Powers enum.
2009-09-18 20:53:50 +01:00
Michael Cortez
61699275ed
Add additional debugging to help track down bug with notices not going to group owner/founder.
2009-09-18 20:53:47 +01:00
Michael Cortez
0cb012aae5
Revert "Thank you, mcortez, for a patch to address showing users in group list"
...
This reverts commit 69ef95693a
.
2009-09-18 20:53:44 +01:00
Rob Smart
4f3975f04e
addition of a new script function osSetParcelSIPAddress(string SIPAddress), now including iVoiceModule
...
This patch allows the land owner to dynamically set the SIP address of a particular land parcel from script. This allows predetermined SIP addresses to be used, making it easier to allow non OpenSim users to join a regions voice channel.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-18 15:47:15 +02:00
nlin
56edbe9b60
Alternate algorithm for fixing avatar capsule tilt (Mantis #2905 )
...
Eliminate dynamic capsule wobble. Instead introduce a small, fixed
tilt, and allow the tilt to rotate with the avatar while moving; the
tilt always faces away from the direction of avatar movement. The
rotation while moving should eliminate direction-dependent behavior
(e.g. only being able to climb on top of prims from certain directions).
Falling animation is still too frequently invoked.
Ideally the tilt should be completely eliminated, but doing so
currently causes the avatar to fall through the terrain.
2009-09-18 11:39:08 +09:00
Alan M Webb
88294d9ebf
While running a test case I had written to pursue problems with
...
llDie() not always completely working, I discovered I was
getting a lot (60+ over 6000 iterations of the test case)
null pointer exceptions in various physics related checks in
SceneObjectPart. It was apparent that the (frequent) checks for
PhysActor being non-null is an insufficient protection in a
highly asynchronous environment. The null reference exceptions
are one example of failure, but it could also happen that a
sequence started with one instance of a PhysicsActor might
finish with another?
Anyway, I have implemented a safer mechanism that should
stop the errors. I re-ran my test case with the fix in place,
and completed nearly 1000 iterations without a single occurrence.
SceneObjectPart is seriously in need of rejigging, if not for
this reason, then for its ridiculous size.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-17 17:49:13 +02:00
Melanie
69ef95693a
Thank you, mcortez, for a patch to address showing users in group list
...
Removed patch 0005, which was unrelated and likely accidental, and further
didn't apply.
2009-09-17 15:38:17 +01:00
John Hurliman
39842eb4af
* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity
2009-09-16 17:17:40 -07:00
John Hurliman
f42d085ab1
SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart
2009-09-16 15:06:08 -07:00
Justin Clark-Casey (justincc)
077d01c225
switch default physics engine to ODE and default meshmerizer to Meshmerizer in code and in OpenSim.ini.example
2009-09-16 18:44:55 +01:00
Justin Clark-Casey (justincc)
a4c093469a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-16 18:21:46 +01:00
Justin Clark-Casey (justincc)
35260faead
on iar save/load, let the user know if they put in the wrong password
...
refactor GetUserInfo() to eliminate copypasta
2009-09-16 18:20:55 +01:00
Rob Smart
281ad1251c
updated the IAuthorizationService interface so that a message is passed back and can be displayed at the client when an avatar is denied access to a region
2009-09-16 10:04:07 -07:00
Alan M Webb
9cbb865985
This fix allows you to configure a script-to-console-log channel
...
association. Then, whenever there is an llSay to that channel,
the message is directed to the OpenSim console log (and NOT
forwarded to the client). This is a great way to capture scripting
events to the log. To enable, add ScriptConsoleChannel = -xxx to
the ScriptEngine parameters in the .ini file. Note that the
message is written using Console.WriteLine rather than
the rather more fragile log4net service. The console channel is
also not subjected to the 1024 character limit imposed on regular
say traffic.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-16 17:07:53 +02:00
Alan M Webb
3b1ef2bfd2
This fixes a boundary case error in the strided list
...
implementation. If the range included only a single item
an empty list was always returned (has no-one been using
this function?)
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-16 16:38:29 +02:00
Alan M Webb
3403ae81e8
Stop a loaded OAR from generating on_rez events. This brings
...
the OAR loader in line with region restart (and the correct
behavior).
2009-09-16 16:29:52 +02:00
Melanie
c5455d4fe7
And another go
2009-09-15 08:24:51 +01:00
Melanie
cec296543c
Attempt to fix the tests
2009-09-15 08:12:53 +01:00
Melanie
7c925744f6
Some OSGrid specific changes, please use this or later for OSGrid use
2009-09-15 07:55:29 +01:00
Teravus Ovares (Dan Olivares)
1ad35f65b3
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-14 16:30:36 -04:00
Teravus Ovares (Dan Olivares)
dc925416d7
* fix missing lock on XMLRPC GroupsModule
2009-09-14 16:30:14 -04:00
Justin Clark-Casey (justincc)
a964bc3ca4
Apply http://opensimulator.org/mantis/view.php?id=4142
...
Re-enable XMLRPC scripting calls
Moves XMLRPC scripting setup to a separate section
Thanks Fly-Man-
2009-09-14 18:31:34 +01:00
Justin Clark-Casey (justincc)
5a64ca4642
label load and save iar commands as experimental.
2009-09-14 16:57:47 +01:00
Justin Clark-Casey (justincc)
dd4d70eafe
re-enable load and save iar commands
2009-09-14 16:54:36 +01:00
dr scofield (aka dirk husemann)
19c5c8b98d
fix to preserve UTF8 encoding in saved script state.
2009-09-14 16:14:59 +02:00
Teravus Ovares (Dan Olivares)
feccfe4096
* Add the RegionCombinerModule back
...
* Yay anonymous delegate in an anonymous delegate.
2009-09-13 19:09:48 -04:00
Teravus Ovares (Dan Olivares)
3a9e1cf0a3
Temporarily removing the RegionCombinerModule to debug a mono assert on linux
2009-09-13 18:43:20 -04:00
Teravus Ovares (Dan Olivares)
ed475f21ee
* Use the BeginInvoke methodology instead of the FireAndForget methodology to try to mitigate a mono assert. Same functionality done a different way.
2009-09-13 18:28:45 -04:00
Teravus Ovares (Dan Olivares)
3562d75c17
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 18:12:44 -04:00
Teravus Ovares (Dan Olivares)
eadea36142
* Move nested classes from the RegionCombinerModule into their own file.
...
* Rename the RegionCombinerModuleIndividualForwarder to RegionCombinerIndividualEventForwarder so there's no possibility that mono.addins sees any names similar
2009-09-13 18:12:24 -04:00
Melanie
efc43aa0d9
Change the type value for given folders to -1. Prevents inventory blowups
2009-09-13 18:24:00 +01:00
Teravus Ovares (Dan Olivares)
fe4f312d55
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-13 07:28:08 -04:00
Teravus Ovares (Dan Olivares)
4241cdc929
* More comments in the RegionCombinerModule
...
* Changed the Destination ID to 0 in the TeleportFinish Event (why did we have it as 3?)
* Added border based trigger teleports
* Fix MakeRootAgent border cross tests for ensuring that the position is inside the region to use the borders to figure out if it's outside the Region
2009-09-13 07:20:18 -04:00
Jeff Ames
01ec93945e
Formatting cleanup.
2009-09-13 13:56:09 +09:00
Diva Canto
40c3ac4aeb
Guarding the unpacking of the email field introduced by Robsmart. Most profiles don't have it. This may fix mantis #4134 .
2009-09-12 09:30:14 -07:00
Melanie
496b368334
Add a using() block around the timer script
2009-09-11 21:52:49 +01:00
Justin Clark-Casey (justincc)
c573a32529
Disable non-user ready load/save iar for now pending possible format change
2009-09-11 20:38:08 +01:00
Justin Clark-Casey (justincc)
f20a052ef5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-11 18:20:41 +01:00
Justin Clark-Casey (justincc)
212efc0c76
Remove bug where iar created folders could not be deleted after relog
...
New folders need to be created with AssetType.Unknown rather than AssetType.Folder!
2009-09-11 16:51:57 +01:00
Diva Canto
ca0810a103
Minor indentation cleanup.
2009-09-11 06:59:10 -07:00
Rob Smart
eaec7cf39c
Changed RemoteAuthorizationServiceConnector so that it implements the IAuthorization interface method isAuthorizedForRegion looks up user and region data and delegates the remote authorization check to the AuthorizationServiceConnector
...
This keeps the IAuthorization as clean as possible and moves the dependency of using a UserProfileData object out to the connector from the scene.
2009-09-11 06:50:24 -07:00
Diva Canto
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
Rob Smart
953ef780c5
adding in working functionality for the remote connector
2009-09-10 17:52:42 -07:00
Rob Smart
16940097be
The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested.
2009-09-10 17:51:28 -07:00
Justin Clark-Casey (justincc)
552ba5334f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-10 18:14:34 +01:00
Justin Clark-Casey (justincc)
eabf5b6c3d
refactor: Replace some iar item name generation in tests with helper function
2009-09-10 17:40:07 +01:00
Justin Clark-Casey (justincc)
f5feb25dd1
fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0
2009-09-10 17:08:26 +01:00
Teravus Ovares (Dan Olivares)
729fbee287
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-10 04:07:08 -04:00
Teravus Ovares (Dan Olivares)
1c878ec425
* Fix an off by one error on visible neighbors in the 'RequestNeighbors' method. This off by one error showed one extra row of neighbors on the north and east side
2009-09-10 03:25:55 -04:00
Jeff Ames
c41387b864
Formatting cleanup.
2009-09-10 15:57:53 +09:00
Teravus Ovares (Dan Olivares)
dc3798ddc3
* Another Timer lock
2009-09-10 00:31:14 -04:00
Teravus Ovares (Dan Olivares)
df9f80aabd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-09 16:20:46 -04:00
Teravus Ovares (Dan Olivares)
c605509da3
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
2009-09-09 16:20:19 -04:00
Diva Canto
5bf288745d
De-hardcode default home locations on create user (standalone).
2009-09-09 11:02:31 -07:00
Justin Clark-Casey (justincc)
0cdec1fbc3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-09 18:11:02 +01:00
Justin Clark-Casey (justincc)
bb1f64fe51
minor: suppress mono warning 0162 generated when comparing const RegionSize against a literal number
2009-09-09 18:09:23 +01:00
Justin Clark-Casey (justincc)
0683cf6e0d
Add test to check behaviour if an iar is loaded where no user profile exists for the creators
...
Disable generation of temporary profiles for now, instead record loading user as creator
2009-09-09 18:03:49 +01:00
dr scofield (aka dirk husemann)
62358014ed
reformatting.
2009-09-09 09:56:07 +02:00
dr scofield (aka dirk husemann)
d8a787bd89
fix: unicode notecards not surviving script treatment ( fixes #4119 ---
...
perhaps).
2009-09-09 09:56:07 +02:00
Melanie
5c606d0233
Thank you, mcortez, for a patch to fix errors in FlotsamCache and expand
...
functionality, adding console commands.
2009-09-08 21:31:09 +01:00
Justin Clark-Casey (justincc)
2bb2a0ec44
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-08 17:50:45 +01:00
Justin Clark-Casey (justincc)
b7256f2567
extend load iar test to loading into a deeply nested directory
...
correct bug associated with this
2009-09-08 17:42:07 +01:00
Justin Clark-Casey (justincc)
36a40e0295
refactor: change method argument name
2009-09-08 16:29:31 +01:00
Justin Clark-Casey (justincc)
46d64da830
minor: remove warning
2009-09-08 16:14:52 +01:00
Justin Clark-Casey (justincc)
76b21860e9
refactor iar name generation
...
slightly change the format of item archive names
2009-09-08 16:12:15 +01:00
Teravus Ovares (Dan Olivares)
f0e2fd426b
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-08 04:43:17 -04:00
Teravus Ovares (Dan Olivares)
9a06056c9a
* Fixes a 'take object from mega region' and rez it in a regular region.. and have it appear 5 regions over bug by limiting the stored position in the asset to Constants.RegionSize. The stored position in the asset gets overwritten anyway by the rezzing routine, but at least this way, there's no chance of the objects border crossing before the rezzing routine finishes.
2009-09-08 04:43:00 -04:00
dahlia
665cf0194a
llRot2Euler() now returns angles -PI < angle < PI
2009-09-07 18:02:02 -07:00
dahlia
7a67b726d5
random drive-by maths optimization in llRot2Euler() and llEuler2Rot()
2009-09-07 17:12:17 -07:00
Justin Clark-Casey (justincc)
fa1d79533e
Only allow iar load/save if user is logged in to the region simulator
2009-09-07 19:57:44 +01:00
Justin Clark-Casey (justincc)
71f1628578
make oar module logging a little less noisy
2009-09-07 19:11:16 +01:00
Justin Clark-Casey (justincc)
10b075a33d
change default iar filename
2009-09-07 18:42:53 +01:00
Justin Clark-Casey (justincc)
116933bee5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-07 18:26:53 +01:00
Teravus Ovares (Dan Olivares)
326c3ee14f
* Enables Child Agents for all virtual regions in the region and their neighbors. There still may be issues with crossing into the mentioned neighbors of the virtual regions. This makes regions larger then 512x512 (3 virtual regions) display fully to clients.
...
* Uses a grid request multiple times, so the more regions are in the instance, the longer logging in takes. Consider this temporary until there's a RegionInfo request similar to the MapItem Request.
2009-09-07 12:57:30 -04:00
Teravus Ovares (Dan Olivares)
c4edefd9a0
minor: organizational
...
* Move the neighbor region lookup to another method from where it was before in EnableNeighbourChildAgents.
2009-09-06 21:26:59 -04:00
Justin Clark-Casey (justincc)
61c286f5d6
change iar load to make discrete inventory service requests rather than the cache
2009-09-06 22:07:35 +01:00
Justin Clark-Casey (justincc)
5640cac8e0
Add convenience functions to InventoryArchiveUtils for locating folders by assuming we're starting from the root
...
Change test methods to use convenience functions
2009-09-06 21:34:20 +01:00
Justin Clark-Casey (justincc)
a92afe8dca
change load iar test to use non-cache find item by path function
2009-09-06 21:26:27 +01:00
Justin Clark-Casey (justincc)
d8316810a1
remove now unnecessary parts of save iar test
2009-09-06 21:20:41 +01:00
Teravus Ovares (Dan Olivares)
8797a82098
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-06 16:15:20 -04:00
Justin Clark-Casey (justincc)
1cc0c94f79
remove warning
2009-09-06 21:15:18 +01:00
Teravus Ovares (Dan Olivares)
511bddc8bc
* Moves another Legacy avatar inbounds check to Border
2009-09-06 16:15:06 -04:00
Justin Clark-Casey (justincc)
881051c8cc
Convert iar write request to use inventory service requests rather than cache
2009-09-06 21:14:42 +01:00
Justin Clark-Casey (justincc)
766d775625
remove warning
2009-09-06 20:17:30 +01:00
Justin Clark-Casey (justincc)
79c22651d7
refactor: use direct scene reference in inventory archive read request
2009-09-06 20:16:56 +01:00
Justin Clark-Casey (justincc)
8616230fcf
refactor: replace some uses of iar module reference with scene instead
2009-09-06 20:04:18 +01:00
Justin Clark-Casey (justincc)
304c78bbbb
Temporarily re-enable save iar test by manually insert the item into the old cache during the test
2009-09-06 19:30:03 +01:00
Melanie
998624544c
Addendum to last commit. With the last commit, some other code that should
...
have been in this commit slipped in. If the last heartbeat is more than
2 seconds ago, kill that thread and start a new one. Untested.
his commit adds support to let the first heartbeat complete unconditionally,
since it is almost always longer.
2009-09-06 16:14:45 +01:00
Melanie
dcebbc3f1b
Remove the encryption from the IAuthenticationService interface. That
...
is too high up for that type of stuff. It needs to be at the
connector/handler level
2009-09-06 15:55:14 +01:00
Melanie
2303945b4e
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-06 04:29:21 +01:00
Melanie
2a8f66b221
Revising the user account data interfaces. No user functionality yet
2009-09-06 04:28:42 +01:00
Diva Canto
babe392709
uh-hum. It might help if I remembered to save the file.
2009-09-05 17:16:43 -07:00
Diva Canto
7d9d8eb90f
This should get rid of the infinite loop upon looking up users/agents by UUID in grid mode. Grr.
2009-09-05 16:56:33 -07:00
Teravus Ovares (Dan Olivares)
8855c2e54c
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-05 03:00:50 -04:00
Teravus Ovares (Dan Olivares)
855fb58c96
* Moves ScenePresence SendCourseLocations to a delegate and provide a method to replace the delegate
...
* RegionCombinerModule replaces this delegate and distributes the CoarseLocationUpdates through the client connection in the region where the user would be if it was a separate region.
* Fixes Mini Map display on combined regions.
2009-09-05 02:58:35 -04:00
Diva Canto
b6744a6566
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-04 22:31:10 -07:00
Diva Canto
c48ec97817
Fixed some long-standing issues with appearance in HG1.
2009-09-04 22:30:30 -07:00
Teravus Ovares (Dan Olivares)
2c09634aed
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-04 20:19:50 -04:00
Teravus Ovares (Dan Olivares)
016a648a30
* Fixes various quirks rezzing in virtual regions.
...
* Breaks up the Client event registrations in Scene into methods of similar event types. The generic event registration registers all of the event types.
*Created symmetrical Un-Registration methods.
* Made the Registration and Unregistration methods public
* Hooks The events required for creating new prim and rezzing new prim into the proper scene.
2009-09-04 20:19:34 -04:00
Justin Clark-Casey (justincc)
7ca61e0174
Add ids to iar requests
...
Stop save iar test wrongly relying on thread pulsing (still disabled though)
2009-09-04 21:10:56 +01:00
Justin Clark-Casey (justincc)
4c560df8ac
If running tests manually, fail immediately on error
2009-09-04 19:22:09 +01:00
Teravus Ovares (Dan Olivares)
50a9e01dfa
* Last commit was a bit of a fail, it registered the root region for it's own permissions events again.
...
* This commit fixes that and does what the last one intended.
2009-09-04 04:41:43 -04:00
Teravus Ovares (Dan Olivares)
f7861a6bad
* Make the RegionCombinerModule also register to handle permissions for the virtual region scenes.
2009-09-04 04:25:56 -04:00