7c1fdb2540
Add "dump asset" command to remote asset connector (the only one that uses a
...
cache at all)
2009-10-01 21:29:57 +01:00
26478ff689
Add "dump asset" command to remote asset connector (the only one that uses a
...
cache at all)
2009-10-01 21:26:53 +01:00
5e9da4daab
Add OnQueueEmpty event to the packet layers. No user functinality yet
2009-10-01 21:08:17 +01:00
94783e9377
Catch and print exceptions in MessagingService, to diagnose mysterious disappearances of the Messaging server.
2009-10-01 09:17:22 -07:00
d0cc0985fa
Fix a merge conflict
2009-10-01 14:45:06 +01:00
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
133a4a9906
- adding new LandDataSerializer testcase to "test-xml" target as well
...
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
05da73c300
fixing LandDataSerializer (yeah! for testcases)
2009-10-01 12:01:41 +02:00
18416ec518
Merge branch 'oar-parcel' into x-opensim
2009-10-01 10:30:43 +02:00
77ed8e977a
adding meat to the LandDataSerializerTest cases.
2009-10-01 10:30:26 +02:00
5b378a793b
Merge branch 'oar-parcel' into x-opensim
2009-10-01 09:48:30 +02:00
40cf840df2
adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)
2009-10-01 09:47:45 +02:00
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
1eb6f99d19
Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.
2009-09-30 20:27:40 -07:00
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
cb26878f96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 17:51:34 -07:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
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
acfe2d9f4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 15:28:23 -07:00
041aaaa62c
Prevent null data being sent to the decoder
2009-09-30 22:21:22 +01:00
79ba96ad6f
Limit the number of packet data blocks to 50, as packets are already limited
...
This is enough to prevent the fast back and forth of allocation and release
the pool is meant to prevent, but not too much so we don't hog memory
2009-09-30 21:33:29 +01:00
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
67fefdb5a0
Remove predecode-j2k and it's assoaciated logic
2009-09-30 21:33:00 +01:00
b0c0d6f9d1
Squelch the debug noise from diva's patch
2009-09-30 20:36:20 +01:00
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
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
8d35cd9061
Remove more tests that don't apply to this build
2009-09-30 19:25:48 +01:00
41e4f3afdb
Remove some tests that no longer apply
2009-09-30 19:14:58 +01:00
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
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
61d6e42af2
Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles
2009-09-30 17:46:04 +01:00
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02:00
d43f739cef
And another merge issue
2009-09-30 19:05:39 +02:00
11750a272e
And another
2009-09-30 19:04:06 +02:00
6b65eb76d0
Another small change to avoid later merge conflict
2009-09-30 19:01:55 +02:00
53fbc970ca
Small chaneg to adapt to trunk
2009-09-30 18:58:52 +02:00
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
33515c75e4
adding LandDataSerializer (not connected anywhere, work-in-progress)
...
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
1006a2254c
Make create user to the Right Thing with regard to salting user passwords
2009-09-30 13:36:03 +01:00
377a8b5229
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-30 11:17:27 +01:00
94aa7e677c
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 09:12:43 +01:00
89016203de
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 16:13:31 -07:00
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
e9c05cf385
change 0.6.7 candidate branch down to RC1
2009-09-29 21:47:11 +01:00
09cb8a594b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-09-29 17:00:02 +02:00
37a8b2b8b7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 07:56:29 -07:00
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
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
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
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
691f1e8aa0
Fix loading modules with alternate configurations and ports into ROBUST.
...
Make all current modules support the configuration name option
2009-09-29 09:56:17 +01:00
13c6202da9
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-29 09:50:18 +01:00
1096103d66
Fix loading modules with alternate configurations and ports into ROBUST.
...
Make all current modules support the configuration name option
2009-09-29 09:44:12 +01:00
6653a30487
Fixed bug in HG that was causing secondlife:// refs to bomb the client.
...
Also fiddled a bit more with the initial CAP in the user server.
2009-09-28 20:58:21 -07:00
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
f4e8ac3556
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-28 18:53:07 -07:00
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
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
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
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
0709149313
Merge branch 'grid-service-redux'
2009-09-28 23:03:47 +01:00
fe3760e4a2
Merge branch 'master' into 0.6.7-post-fixes
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
2009-09-28 22:57:38 +01:00
a1aa362866
Allow the notation config_name@port/dll_name:class_name as a handler spec
...
in OpenSim.Server.ini
This allows things like "8003/AssetServirce.dll local@8004/InventoryService.dll"
The config name is not yet supported by any modules
2009-09-28 22:48:57 +01:00
276b0a0cbe
Forgot a return statement.
2009-09-28 11:17:34 -07:00
9bdb585a93
Added Protocol versions back, this time in a range model.
2009-09-28 10:56:05 -07:00
7cd03abab5
Bump main version to 0.6.8-Dev
2009-09-28 18:41:21 +01:00
63c3c7483f
Bump version number in post-fixes
2009-09-28 18:38:48 +01:00
3091e5db9d
Fixed bug in user server related to region's serverURI.
2009-09-28 07:53:52 -07:00
500cd3505a
Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now.
2009-09-28 07:20:38 -07:00
69da82b39f
Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer.
2009-09-28 06:44:57 -07:00
0f05bbb4a2
Deleted some files that aren't being used anymore.
2009-09-28 05:54:37 -07:00
0ed7371f3e
Change DocToBytes to return no trailing whitespace.
2009-09-28 13:27:33 +01:00
73a61a8a32
Fixed small bug in having to deal with RegionInfo's ServerURI, which wasn't being set.
2009-09-27 21:14:31 -07:00
0766b6dc34
Fixed the connection from User server to GridServer.
2009-09-27 20:44:43 -07:00
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
b17be045e4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-27 16:02:19 -07:00
689eea3bad
Guarding the methods under if (m_Enabled)
2009-09-27 15:06:44 -07:00
42746e99bd
Make the RegionData plugin store the RegionName
2009-09-27 23:02:40 +01:00
cde6b0d5ab
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-27 14:59:43 -07:00
1980ab3152
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-27 14:39:41 -07:00
c99b363f81
Added missing IHyperlinkService.
2009-09-27 13:59:00 -07:00
12640d0824
Prevent manually setting Data["locX"] and Data["locY"], since that would
...
overwrite the posX and posY members of the structure
2009-09-27 21:58:34 +01:00
2432cc607e
Neighbours cache working.
2009-09-27 13:43:57 -07:00
b5bf3f87d5
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
2009-09-27 21:25:10 +01:00
8e091f5903
Add the Migration for the regions table
2009-09-27 21:17:23 +01:00
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
68e40a87ca
Poof! on LocalBackend. CommsManager.GridServices deleted.
2009-09-26 21:29:54 -07:00
620fa2b772
Poof! on OGS1 GridServices.
2009-09-26 21:21:06 -07:00
989382352d
Poof! on Region.Communications.Hypergrid. Grid code deleted.
2009-09-26 21:14:41 -07:00
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
dcfd08b8dd
Fixed a bug with link-region.
2009-09-26 11:01:18 -07:00
b5163889b9
Fixed the order of params to GetRegionRange.
2009-09-26 10:30:45 -07:00
368ae02dc9
Corrected the port number to 8001 in the test client and grid ini.
2009-09-26 10:18:22 -07:00
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
d39e67d5b2
More redirects to HGGridConnector-as-HyperlinkService.
2009-09-26 08:06:14 -07:00
7253a9453e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-26 07:49:04 -07:00
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
a7f3d01f8a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-09-25 16:06:40 -04:00
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
fb2cabd6b3
corrections to viewerMode AddPos()
2009-09-25 13:01:48 -07:00
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
2995d87d75
minor: remove some mono compiler warnings
2009-09-25 19:29:40 +01:00
0bdf75637f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-25 19:19:01 +01:00
eed8a61559
More small changes to FlotsamAssetCache as per mcortez' request.
2009-09-25 08:47:45 -07:00
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
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
295868033f
Better error handling on the client-side grid connector.
2009-09-25 07:47:58 -07:00
b2772b3a2d
Added GridForm.html in Tests/Clients/Grid that shows how to interact with a grid server via regular Web forms. May be good for developing administrative tools.
2009-09-25 07:38:05 -07:00
613cb417c0
add control files containing version info to iars
2009-09-25 14:52:53 +01:00
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
52e477b41f
Better guards on RegisterRegion in GridService.
...
Added serverPort to the fields that get stored (I think this is the UDP port).
2009-09-25 06:02:41 -07:00
eb0aa6a7f4
Make the grid client deregister the test regions at the end, so that they don't stay in the DB.
2009-09-24 18:48:38 -07:00
b6824c495c
Deleted the meaningless console commands on the GridService. Will need to add meaningful ones.
2009-09-24 18:28:38 -07:00
a792933cba
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-24 18:25:28 -07:00
6a5d7650d0
All tests pass for MySQL/MySQLRegionData.
...
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
2009-09-24 18:23:55 -07:00
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
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
1faaa0a43a
GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire.
2009-09-24 15:30:00 -07:00
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
784e78a9e8
minor: make rest (not comm) modules less noisy if they are disabled
2009-09-24 17:21:47 +01:00
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
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
e67341f24c
minor: replace xmlprc 'no method found' magic number with constant from xmlrpc library
2009-09-24 15:02:55 +01:00
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
2824bbc47b
Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn't conflict with the existing one.
2009-09-24 05:48:35 -07:00
ca69fac13e
* Send Updated Information Packet to Clients after updating estate settings.
2009-09-24 22:02:29 +10:00
8605c5d2eb
* Establishing why new console commands fail to work. >_>
2009-09-24 21:46:41 +10:00
57429423bb
* Fixing typo.
2009-09-24 21:29:57 +10:00
71a4b02c7e
* Minor commit, added two new math utility functions.
2009-09-24 20:56:01 +10:00
aca9fd182e
* Added two new commands to EstateManagementModule
...
* Also, I hate git.
2009-09-24 20:27:11 +10:00
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
fd8fb7735b
First test passes -- regions being registered and retrieved correctly in Data.Null.
2009-09-23 20:39:25 -07:00
3c19bd5142
Unit tests for the grid service. Yey!
2009-09-23 20:35:16 -07:00
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
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
c592a60f46
Fix endlines on UrlModule.cs
2009-09-23 15:00:18 -04:00
9c2ffa8f2e
* fix endlines in LSL_api.cs
2009-09-23 14:55:22 -04:00
eb892e0545
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-23 18:42:20 +01:00
35deff7ec4
Modules active. Tested HGGridConnector in standalone only for now. Modules commands work.
2009-09-23 09:27:01 -07:00
03438f7d44
minor: remove double initialization of user appearance module in Grid.UserServer.Main
2009-09-23 16:24:26 +01:00
486a9a5b61
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 07:54:13 -07:00
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
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
5dc3e560d3
* Makes SimulatorEnable messages 'reliable' and subject to redelivery.
2009-09-23 10:30:18 +10:00
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
0fc2b73e7b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-22 14:15:53 -07:00
34f4738159
Added HGGridConnector and related code.
2009-09-22 11:58:40 -07:00
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