Justin Clark-Casey (justincc)
d3ed5de77d
Add loglevel to jobengine that can be controlled via "debug jobengine loglevel <level>".
...
Defaults to 0
Level 1 currently does verbose logging about every queued and processed job.
2014-11-25 23:18:38 +00:00
Justin Clark-Casey (justincc)
9fb3065d33
Temporarily add root agent rez attachments work to job engine if it is running rather than as a fire and forget.
...
Experiment to see if serializing attachment rez and send initial data jobs improves other parts of sim performance.
2014-11-25 23:18:38 +00:00
Justin Clark-Casey (justincc)
859b1c5ba4
Add experimental job engine to see if queueing some existing async work during root agent entry to a region improves perf rather than always attempting to execute everything concurrently
...
Job engine is controlled via "debug jobengine start|stop|status".
Can only currently be enabled and disabled dynamically at runtime.
Currently only applies to code sending initial region data (objects, other avatar data) to a client.
2014-11-25 23:18:37 +00:00
Melanie Thielker
bec456c2a5
Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module.
2014-11-11 07:09:30 +01:00
Melanie Thielker
64deb6ae6f
Second part of invisible base avatar option
2014-11-10 19:49:58 +01:00
UbitUmarov
caddabb5c4
scale ChildAgentThrottles with distance (internal to child server and not
...
root as was done before )
2014-11-06 22:25:16 +00:00
UbitUmarov
377a8072dc
remove last debug msg
2014-11-01 16:04:22 +00:00
UbitUmarov
f2ea426453
debug msg
2014-11-01 15:52:05 +00:00
Justin Clark-Casey (justincc)
a05be7bd65
Add "region set" console command.
...
This current allows one to set two region parameters
agent-limit <int> will set the current root agent limit for the region, as also settable through the viewer, though some impose a max setting (e.g. 100).
max-agent-limit <int> will set the maximum allowed root agent limit. This can also be set via the MaxAgent parameter in region config.
2014-10-31 21:47:12 +00:00
BlueWall
b463870914
Add hypergrid teleporting support to user profiles picks
2014-10-27 17:27:42 -04:00
UbitUmarov
932b52f1bf
missing file
2014-10-26 18:22:46 +00:00
UbitUmarov
736490dcb6
dont send baked textures assets, but send cache information
2014-10-26 18:13:44 +00:00
UbitUmarov
4cbc13b52f
don't send pack baked texture assets into updates.
2014-10-24 19:50:51 +01:00
UbitUmarov
fd79f75ba6
TEST**** wingridproxy detection at grid login. Untested possible not
...
very reliable. Adds some load even on region servers because of code at
BaseHttpServer.
2014-10-24 02:12:30 +01:00
UbitUmarov
afa9b4a002
Assume childreen don't need to know caps seeds
2014-10-20 09:14:27 +01:00
UbitUmarov
f44c29effb
try to fix propagation of seeds to all relevante regions
2014-10-19 15:51:12 +01:00
UbitUmarov
2bea66ed27
send motion control state in update to childs. Reset CollisionPlane on
...
makechild
2014-10-17 14:07:11 +01:00
UbitUmarov
c643ff4cba
fix some errors when using http debug level > 4
2014-10-15 14:14:25 +01:00
UbitUmarov
a301bad8ad
on util thread pool reduce the min number of threads, increase the
...
maximum and increase the idle time before release to OS
2014-10-13 12:10:13 +01:00
UbitUmarov
cd87c4bec5
change/fix previus commits
2014-10-13 12:00:31 +01:00
UbitUmarov
8558e97a44
tune poll smartThreadpool use and give it a name
2014-10-13 11:38:51 +01:00
Melanie Thielker
93fa3777d2
Merge branch 'ubitworkmaster'
2014-10-03 18:27:27 +02:00
Melanie Thielker
c66e4eeb7d
Also store names of assets in the AnimationSet
2014-10-03 18:27:14 +02:00
UbitUmarov
cfb1a27300
Merge branch 'master' into ubitworkmaster
2014-09-29 20:36:03 +01:00
Melanie Thielker
3ea76e3131
Make changes to AnimationSet to allow indexing by names rather than indices. Add some debugging output and prepare for parsing an ascii-based format.
2014-09-27 02:30:01 +02:00
UbitUmarov
bb019945e8
change permitions again
2014-09-26 15:20:45 +01:00
UbitUmarov
46caea6987
change it again...
2014-09-26 15:03:33 +01:00
UbitUmarov
90cad82405
remove unnecessary argument ref
2014-09-26 14:22:54 +01:00
UbitUmarov
fcad64209c
make c# more happy
2014-09-26 14:17:01 +01:00
UbitUmarov
3e2242b4c4
change animset permitions to reflect no transfer nature
2014-09-26 14:06:16 +01:00
UbitUmarov
cce31b6638
add centerlized AnimationSet item permitions setting
2014-09-26 14:00:33 +01:00
Justin Clark-Casey (justincc)
23a0946e36
Fix long-lived thread name logging.
2014-09-26 01:10:49 +01:00
Melanie Thielker
546537c056
Rename = too generic
2014-09-25 21:54:32 +02:00
Melanie Thielker
2e6fd6536b
Add the AnimationSet skel
2014-09-25 21:53:32 +02:00
Melanie Thielker
80f3e8edbc
Fix stupid stuff.
2014-09-24 00:21:14 +02:00
Melanie Thielker
a6b27a7aa4
Add a link number field to ColliderArgs
2014-09-24 00:16:04 +02:00
Jak Daniels
bde60cc92e
Add persistent command history in console
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
Melanie Thielker
0bfba122f0
When a ghosted avatar is removed, also remove any remaining CAPS
2014-09-22 18:49:08 +02:00
Melanie Thielker
640f3f3074
A stab at brute force fixing the locking - one, make m_itemLock volatile, two,
...
reset the lock even if the write lock is not apparently held.
2014-09-21 19:24:15 +02:00
BlueWall
96a2449122
Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.""
...
Fix for break in next commit
This reverts commit 376fab1402
.
2014-09-17 20:03:54 -04:00
BlueWall
376fab1402
Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."
...
This reverts commit af286d5fcb
.
Issue with Jenkins builds
2014-09-17 18:11:41 -04:00
BlueWall
af286d5fcb
Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.
2014-09-17 17:56:10 -04:00
UbitUmarov
df389dceb8
add some _response.close. RestClient still looks bad. It should be a
...
proper IDisposable object.
2014-09-17 16:19:00 +01:00
UbitUmarov
9bf3e2a257
dispose some tmp streams
2014-09-17 15:36:22 +01:00
UbitUmarov
016e58e354
*test*
2014-09-09 21:53:27 +01:00
Justin Clark-Casey (justincc)
b4ce71df1e
Make proper fix for last commit wrt Mantis 7317 by replacing disallowed c char and not literal 'c'
2014-09-09 18:57:02 +01:00
Justin Clark-Casey (justincc)
e271607bef
For stat names containing periods, replace with '#' rather than throw exception
...
In relation to http://opensimulator.org/mantis/view.php?id=7317
2014-09-09 18:56:58 +01:00
Justin Clark-Casey (justincc)
41f2f3132b
For monitoring purposes, start non-timeout tasks (which do not currently use a threadpool) via Watchdog.RunInThread() rather than Util.RunThreadNoTimeout()
...
The functionality is the same but this allow us to monitor such tasks via "show threads" and abort them for test purposes, etc.
Also extends thread names to provide more info (e.g. SendInitialDataToClient says what client the task is for).
2014-09-05 23:20:59 +01:00
Justin Clark-Casey (justincc)
1b75ec5647
Ignore whitespace when reading serialized XML objects.
...
This was previously effectively being done by XmlDocument in the multiple passes through the XML.
This change tells XmlReader to ignore whitespace. This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly.
XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
2014-08-29 19:08:23 +01:00
UbitUmarov
7351d92a76
add method to get a category throttle rate
2014-08-29 16:19:30 +01:00
UbitUmarov
63d1916f51
Remove entities from updates queues on kill. Do it sync so enqueues after
...
the kill work
2014-08-23 20:59:11 +01:00
UbitUmarov
5bf145a397
add a direct sendpartfullUpdate to send a full object update to a part,
...
optionally overriding its parentID. check what it does to attachments
2014-08-21 00:49:10 +01:00
UbitUmarov
88587b4e73
reserve updates priority queue 2 for attachments, send them by it on
...
BestAvatarResp scheme. Attachments cannot be sent on imediate queues,
since they will block everything. Changed distance to priority math,
keeping identical result, shifted to start at queue 3.
2014-08-20 21:41:16 +01:00
UbitUmarov
ff518e7cbb
make webutilmore verbose on PUT for avatar updates. Reduce LargeTime debug
...
level to 500ms from 3000ms
2014-08-17 02:12:45 +01:00
Justin Clark-Casey (justincc)
e0c6bfa81e
If a user moves back in sight of a child region before the agent has been closed on teleport, don't unnecessarily resend all avatar and object data about that region.
2014-08-15 21:47:34 +01:00
Justin Clark-Casey (justincc)
91e1aaa5d4
On teleport to a region that already has a child agent established (e.g. a neighbour) don't resend all the initial avatar and object data again.
...
This is unnecessary since it has been received (and data continues to be received) in the existing child connection.
2014-08-15 21:47:34 +01:00
UbitUmarov
447fd0850a
remove duplication of textures, wearables and attachments on crossings.
...
receiver checks old method if it doesnt get packed appeareace
2014-08-15 21:39:37 +01:00
UbitUmarov
8c657e4837
add a estimator of client ping time, and painfully make it visible in show
...
connections console command
2014-08-14 20:41:36 +01:00
UbitUmarov
395903d58f
*DANGER* dont send baked textures assets to Neighbours. Possible we could
...
send a lot less
2014-08-14 02:36:50 +01:00
UbitUmarov
a1cc218f10
*DANGER* make baked textures cross and make use of it * UNTESTED *
...
issue: alll this seems to be sent back to childs, need to stop that
2014-08-14 01:53:51 +01:00
Justin Clark-Casey (justincc)
f1f935ed95
Add 'server' stats information to pCampbot, as used elsewhere in OpenSimulator
...
This adds the "show stats", "stats record", etc. commands and information on available Threadpool threads, etc.
It also adds the Watchdog which logs warnings if time between executions is unexpectedly large.
2014-08-13 19:53:42 +01:00
UbitUmarov
3e7f475e58
fix the damm thing
2014-08-12 21:08:01 +01:00
Melanie Thielker
ddfb05e57a
Comment out stupid XEngine-bound message about script vs non-script startup, it's annoyed me for a long time. Comment out periodic stats as well, they've never been useful to us and just cause console spew.
2014-08-09 05:31:09 +02:00
UbitUmarov
998e3d435a
DANGER back to right current max number of wearables ( TP out of regions
...
with this may kill old regions)
2014-08-08 01:39:19 +01:00
UbitUmarov
16bcd86dfb
back to max 15 wearables until its safe ( and before i kill other grid
...
regions)
2014-08-08 00:01:49 +01:00
UbitUmarov
a8e49a4538
max 16 for testing
2014-08-07 23:33:48 +01:00
UbitUmarov
4ae0bb7df1
add limites checks on wearables size, revert to max 15 for
...
compatibility/testing
2014-08-07 23:29:31 +01:00
UbitUmarov
7486684436
update the max number of texture faces and wearables to current values.
...
This should be safe now..
2014-08-07 22:47:29 +01:00
UbitUmarov
c3f9c99fb3
DANGER... changed bakedtextures caching. Assuming grid baking is cache
...
only, reduced number of accesses to it. TESTING
2014-08-07 05:20:45 +01:00
UbitUmarov
6eca2475d4
dont assume that all zero folded perms are to ignore ( coerence with old
...
code in avn-current )
2014-08-05 17:55:30 +01:00
UbitUmarov
a5e9429f2b
MESS: changes in MakeRootAgent and CompleteMovement reordering things.
...
Added sending of land overlay and parcel information. This in order to
only send avatar related information after having its position well
defined and on the right parcel. THIS MAY STILL BE BAD :)
2014-07-31 03:10:50 +01:00
UbitUmarov
d6dbfd1687
missing file in commit 5fe1f87837
2014-07-30 15:43:54 +01:00
Melanie Thielker
0c2537bb24
Try to plumb the other half
2014-07-29 04:41:38 +02:00
Melanie Thielker
dfa9780c8c
Send new parcel permissions to activate viewer options - done right this time
2014-07-29 04:19:01 +02:00
Justin Clark-Casey (justincc)
f6f7585ec5
Add a "debug scene set child-repri <double>" command that allows child reprioritization distance to be changed on the fly.
...
This governs when child agent position changes are sent to neighbouring regions.
Corresponding config parameter is ChildReprioritizationDistance in [InterestManagement] in OpenSim.ini
For test purposes.
2014-07-29 00:13:29 +01:00
Justin Clark-Casey (justincc)
1e3027afb1
Temporary stop CAPS service points from being added to stats as this can be a huge number.
...
A stop gap solution - a better one may be to improve stats display on simulator-side.
Caps information is still accessible via the "show caps stats by user" and "show caps stats by cap" commands
2014-07-26 01:41:03 +01:00
Justin Clark-Casey (justincc)
8c5c9806d7
Add stats for service endpoints using existing data.
...
For each service endpoint (e.g. posts to the xinventory service), a stat is available which shows the number of requests received and moving average per second
The full name is "service.<http-method>:<path>.requests (e.g. service.POST:/xinventory.requests)
2014-07-25 23:00:41 +01:00
Justin Clark-Casey (justincc)
cc61681484
Revert "Write UDP statistics to the log, not just the console (e.g., "show queues")"
...
Fixes http://opensimulator.org/mantis/view.php?id=7280
It can't be done this way because the stats data needs to show up on the console at all log levels, not just debug.
But this means setting it to log at fatal, which is not appropriate for this stuff in the log.
I understand the desire but this has to be done some other way, perhaps by (yet another) config parameter.
Also, this was already being done with the ClientStatsReport but that also should be done in another way, I think.
This reverts commit 5d53412766
.
2014-07-25 01:56:41 +01:00
UbitUmarov
86a9710e77
change previus code, send a NoEvents response back to http server, even
...
if we know there is no one there, so that the server finishes handling
it.
2014-07-24 23:32:39 +01:00
UbitUmarov
05d071a430
let BlockingQueue timeout work as its suposed to and not wait for ever
2014-07-24 05:37:56 +01:00
UbitUmarov
f236b2e5d3
request.DoHTTPGruntWork(..) is now identical to our version, so use
...
those again, getting code closer to os
again
2014-07-23 02:14:15 +01:00
Justin Clark-Casey (justincc)
3355bedaeb
minor: Limit processor related stats to 3 decimal places instead of all the places.
...
Easier to read and analyze, and probably still too much detail (1 dp would probably be fine)
2014-07-21 23:08:15 +01:00
Justin Clark-Casey (justincc)
200dcee1b7
Fix CPU processor use reporting on Mono.
...
Despite the comments in the code, it appears that the issue where the .NET performance counter was wrongly idle time time on Mono was fixed in 2009.
https://bugzilla.novell.com/show_bug.cgi?id=468625
Which means that the workaround is no longer necessary and produces bad results instead.
2014-07-21 22:55:38 +01:00
Oren Hurvitz
712c50e0bf
Don't append attachments multiple times
2014-07-21 09:29:50 +01:00
Oren Hurvitz
6b57b61836
Log RestClient requests similarly to WebClient (e.g, "debug http all 6" logs the entire request and response)
2014-07-21 09:24:45 +01:00
Oren Hurvitz
af3498efdb
In "show throttles", show the maximum drip rate. This shows whether a client is being throttled due to past poor performance.
2014-07-21 09:10:50 +01:00
Oren Hurvitz
5d53412766
Write UDP statistics to the log, not just the console (e.g., "show queues")
2014-07-21 09:10:19 +01:00
Oren Hurvitz
48d1cca303
Better logging of threadpool activity in Overload mode: if we didn't log "Queue threadfunc" for a particular thread then don't log "Run threadfunc" or "End threadfunc" for that thread either.
2014-07-21 08:30:17 +01:00
Oren Hurvitz
99ac770abb
Close streams immediately when we finish using them
2014-07-21 08:30:03 +01:00
Melanie Thielker
e1b2ecdfdc
Merge branch 'avination-current'
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
Justin Clark-Casey (justincc)
d1b7c2ece3
minor: remove long unused RegionInfo.ignoreIncomingConfiguration
2014-07-19 01:15:15 +01:00
Justin Clark-Casey (justincc)
29d5950838
minor: remove long unused RegionInfo.commFailTF
2014-07-19 01:10:53 +01:00
Justin Clark-Casey (justincc)
a26d1ffc66
minor: add method doc to ICommands.HasCommand()
2014-07-18 22:31:04 +01:00
Justin Clark-Casey (justincc)
9be935ac6d
Add ICommands.HasCommand() method so that we can detect whether a command has already been registered without needing to also run it
2014-07-18 22:27:39 +01:00
UbitUmarov
19d33c571d
Merge branch 'avination-current' into ubitwork
2014-07-16 16:22:32 +01:00
Justin Clark-Casey (justincc)
0c8f3dddd8
Use thread-safe version of .NET Random as the SDK class is not thread-safe.
...
As per http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx , the .NET Random class is not thread-safe.
If called by multiple threads at once, methods may return 0.
Except for llRand(), other OpenSimulator code did not lock before calling a shared Random instance.
This commit adds a ThreadSafeRandom class that extends Random but does internal locking so that it is thread-safe.
This change is invisible to existing callers and the explicit locking in the llFrand() implementation is now redundant.
2014-07-14 20:08:11 +01:00
Justin Clark-Casey (justincc)
a8860d79d8
Turn RestClient.Request() logging down the debug and comment out for now.
2014-07-09 23:12:14 +01:00
Justin Clark-Casey (justincc)
8ae5ab809f
Fix issue with running "stats record start|stop" console command
...
In commit e6080a38
(Wed Mar 19 00:29:36 2014) I renamed this from "debug stats record start|stop"
Unfortunately, I didn't do this fully so before this commit "stats record start|stop" will report a usage failure with the old debug text.
Unfortunately this is in the 0.8 release. The workaround is to repeat the last command twice (e.g. "stats record start start")
2014-07-08 18:49:57 +01:00
Justin Clark-Casey (justincc)
889194db63
Actually call Close() for shared region modules when the simulator is being shutdown.
...
Adds regression test for this case.
2014-07-02 23:49:25 +01:00
Melanie Thielker
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
Justin Clark-Casey (justincc)
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
Justin Clark-Casey (justincc)
602587b8d5
Update dev version to 0.8.1
2014-06-17 18:32:26 +01:00
Robert Adams
7f0adfd203
Add [Startup]LogShowStatsSeconds=n parameter which controls the interval
...
that simulator statistics is output to the console. Setting to zero turns
stats logging off.
2014-06-13 21:27:07 -07:00
Justin Clark-Casey (justincc)
31096fb1fe
Add rc3 flavour option
2014-06-10 20:19:19 +01:00
Diva Canto
14a31c3e9b
Correct minor bug regarding packing of estate bans
2014-06-01 12:01:49 -07:00
Diva Canto
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
Diva Canto
eaf595c008
Fix a bug where estate not found would result in a dummy estate record with erroneous information.
...
Also, added conversion of EstateSettings from/to key-value pairs in preparation for robust net work connectors.
2014-05-31 11:40:54 -07:00
dahlia
9ced61fbc2
Add a 0 parameter overload for RestClient.Request() for use when no auth is required. This preserves API compatibility for external modules using this function.
2014-05-30 13:47:19 -07:00
Justin Clark-Casey (justincc)
8656b5e948
Fix bug where setting a parcel in a varregion for sale would make sale bitmap generation in WorldMapModule throw an exception on next startup.
...
This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
2014-05-30 19:40:10 +01:00
Oren Hurvitz
33cc847c4a
When saving an OAR in "Publish" mode, also discard Group information
2014-05-26 15:33:13 +01:00
Diva Canto
227685bea4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-23 16:20:04 -07:00
Diva Canto
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
Justin Clark-Casey (justincc)
f55e153636
Compile the regex that extract categories for colourization just once rather than on every single log.
...
Compiling every time is unnecessary since Regex is thread-safe.
2014-05-23 21:09:48 +01:00
Justin Clark-Casey (justincc)
fbcb76383d
Allow console output to be multiline by making colourization regex RegexOptions.SingleLine
2014-05-23 20:57:50 +01:00
Oren Hurvitz
251b93d97e
Store the Teleport Flags in the Circuit. This doesn't seem to be necessary, because everything has worked so far, but it's the right thing to do.
2014-05-22 13:16:06 +01:00
Oren Hurvitz
882af7195c
Better error-handling and logging in case User Profile requests fail
2014-05-19 11:11:06 +01:00
Justin Clark-Casey (justincc)
4569c595bf
Fix behaviour change in recent commit bbc1dc6
so that SynchronousRestObjectRequester.MakeRequest() calls with no timeout specified use the default HttpWebRequest timeout as previously.
...
I mistakenly thought that that default request timeout was inifite rather than 100 seconds, restoring previously behaviour.
As per http://msdn.microsoft.com/en-us/library/system.net.httpwebrequest.timeout%28v=vs.100%29.aspx
Relates to http://opensimulator.org/mantis/view.php?id=7165
2014-05-13 22:21:20 +01:00
Justin Clark-Casey (justincc)
bbc1dc6bce
Replace existing 0 timeout in internal overloaded SynchronousRestObjectRequester.MakeRequest() methods with proper Timeout.Infinite (-1) instead.
...
Triggered by recent faf9ba53
though this was wrong in the code before, it's just that we didn't actually try to set the timeout given.
2014-05-12 22:37:07 +01:00
Justin Clark-Casey (justincc)
7db4336f1c
minor: Add method doc to SynchronousRestObjectRequester.MakeRequest() methods
2014-05-12 22:05:02 +01:00
Justin Clark-Casey (justincc)
faf9ba53fc
In SynchronousRestObjectRequester.MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections) actually set timeout on WebRequest if given.
...
Previously, we were doing nothing with this parameter.
No effect on current code since none of the 6 callers attempt to use the timeout.
2014-05-12 19:20:00 +01:00
Oren Hurvitz
0fe08c8799
- When sending the "My Suitcase" folder to the client, always claim it has Folder Type 8. (Previously we had used Folder Type -1 in one place, and LLClientView didn't even bother changing Folder Type 100 to anything else.)
2014-05-06 07:16:37 +01:00
Justin Clark-Casey (justincc)
f0411dc128
minor: Use Vector2.Zero constant and only set in condition branch where it was missing in TryParseConsole2DVector(). xbuild still compiles.
2014-04-30 21:50:18 +01:00
BlueWall
44f533d95a
Assign value to 'vector' to fix building under xbuild and Monodevelop
2014-04-30 15:45:00 -04:00
Justin Clark-Casey (justincc)
253110293a
Add "terrain show" console command which outputs terrain height for a given region co-ordinate.
...
For debug purposes.
2014-04-30 18:04:47 +01:00
Oren Hurvitz
88f7a833dc
Improved HTTP logging
2014-04-29 07:59:17 +01:00
Melanie Thielker
1d1e444aed
Convert region loading to new format
2014-04-26 02:43:13 +02:00
Melanie Thielker
5c661baf6c
Allow opening a https port using only http so that nginx can be used for ssl
2014-04-26 02:42:30 +02:00
Justin Clark-Casey (justincc)
904baa6da6
Fix issue where terrain height values > 327 caused chaotic spiked terrain.
...
Per http://wiki.secondlife.com/wiki/Tips_for_Creating_Heightfields_and_Details_on_Terrain_RAW_Files#Notes_for_Creating_Height_Field_Maps_for_Second_Life
terrain heights up to 508 are possible on the LL grid (and were available on previous releases of OpenSimulator).
The obvious way to allow both this and equivalent -z values, is to rewiden the internal terrain height storage from short to int.
The memory tradeoff is most noticeable on the maximum 8192x8192 var region (equiv to 1024 normal regions), where it adds 128mb to resident use (128k on a normal region)
This is still better than the double used in previous releases.
This does not affect physics or data storage since they already use float and double respectively.
This may not be the final solution if we actually want to sacrifice -z, >327 or something else.
Relates to http://opensimulator.org/mantis/view.php?id=7076
2014-04-25 22:56:25 +01:00
Melanie
a108fcac95
Restore overload mode accidentally disabled in a prior commit. Add a new
...
config option, LogOverloads, to log when a thread pool overload occurs.
This option defaults to "True" because the logging data is useful for
diagnosing threading issues.
2014-04-25 21:34:29 +01:00
Oren Hurvitz
bc06db3df4
- Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity.
...
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
2014-04-24 15:58:43 +01:00
Oren Hurvitz
d15a3b10a3
When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6".
2014-04-24 15:58:41 +01:00
Melanie
5dc0298f83
Apply logging flag to a spammy message that may have been overlooked.
...
No one needs to see every thread launch.....
2014-04-24 01:44:11 +01:00
Oren Hurvitz
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
Oren Hurvitz
93a9ed2a6d
Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures.
2014-04-22 12:18:54 +03:00
Melanie
574a11558d
Refactor: Rename GetOtherSetting to GetSetting and make SetOtherSetting private
2014-04-12 17:32:16 +01:00
Melanie
5d964a6424
Remove the old XML format parsing. Now additional region params can just be
...
added as they are already exposed through an API when using Nini. That will
remove the need to always edit RegioInfo just to add a region based setting.
2014-04-12 16:58:07 +01:00
Dev Random
f0998a9222
Add per-user checking to PrimLimitsModule
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-04-12 09:28:29 +01:00
Oren Hurvitz
672bd9fc98
Reduced log levels for REST 404 errors to DEBUG
2014-04-03 15:04:26 +01:00
Oren Hurvitz
01daa74adf
Better error messages in RestClient
2014-04-03 14:13:22 +01:00
Oren Hurvitz
2051535ce1
String matching in REST handlers: must allow '-' as a separator, because the "/map" handler uses it
2014-04-02 15:11:54 +01:00
Oren Hurvitz
aa217cf90f
Better string matching when searching for REST handlers: must match an entire path component (ending with '/' or a similar character).
...
For example, these should match: "/assets" and "/assets/12345", but these shouldn't match: "/assets" and "/assets_exist".
2014-04-02 08:52:44 +03:00
Oren Hurvitz
bbfda8e19e
Fixed last-resort sending of error response (HTTP 500) when an error occurs while handling a request.
...
The previous code didn't actually send the response, so the caller was stuck until the timeout (100 seconds).
2014-04-02 06:32:41 +01:00
Oren Hurvitz
d1c3f8eef5
Added assets service method AssetsExist(), which returns whether the given list of assets exist.
...
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
2014-04-02 06:30:57 +01:00
BlueWall
45ada5ca2d
Merge branch 'master' of /home/opensim/var/repo/opensim
2014-03-27 12:56:12 -04:00
BlueWall
a15282f023
Merge branch 'master' into m_test
2014-03-27 12:21:38 -04:00
Oren Hurvitz
161c827a44
Fixed a case where logging an HTTP response failed because the stream was non-seekable
2014-03-27 17:46:37 +02:00
Oren Hurvitz
76add0fdb0
Log errors in MakeRequest() as INFO, not ERROR. Some communications problems are benign (e.g., can't send Friend status update to a region that is down), so don't log them as ERROR so soon. We rethrow the exception, so the caller can still decide to log the error as an ERROR.
...
Resolves http://opensimulator.org/mantis/view.php?id=7077
2014-03-27 15:00:42 +01:00
Justin Clark-Casey (justincc)
b0bae62c30
refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property
2014-03-26 20:58:58 +00:00
Oren Hurvitz
7a47c15edb
- Increased the threadpool timeout to 10 minutes
...
- Changed a few places that launch long-lasting threads to skip the timeout altogether
2014-03-26 20:34:55 +01:00
Oren Hurvitz
6d1d58b654
Use the "X-Content-Encoding" header to indicate gzipped data, because old OpenSims fail if they get an unknown "Content-Encoding"
2014-03-25 18:09:23 +01:00
BlueWall
9aec36156e
Sync code that has moved in development branch with changes in master
2014-03-25 11:09:27 -04:00
BlueWall
dba33fee39
Move from UserProfileModule for general availability
2014-03-25 11:08:11 -04:00
Oren Hurvitz
b1d8aa0b64
Use the "Content-Encoding" header to indicate gzipped streams
2014-03-25 15:36:59 +01:00
Oren Hurvitz
f90aee696a
Always throw an exception if MakeRequest (used for HTTP POST) fails. (Previously many exceptions were ignored)
...
Resolves http://opensimulator.org/mantis/view.php?id=6949
2014-03-25 09:37:10 +01:00
Oren Hurvitz
f901a38204
Improved logging of HTTP requests
...
- MemoryBuffer isn't seekable, so we can't log it. Log the string instead.
- Handle compressed streams
- Don't attempt to dump binary data. Either don't log it at all (if we know it's binary), or at least convert non-ASCII characters to ASCII.
- Log responses to HTTP requests
- Use the same log prefix for all of these log messages ("[LOGHTTP]"), to make them easy to see at a glance
- Increased the snippet length to 200 (80 doesn't show enough), and add "..." only if the message was actually truncated
Resolves http://opensimulator.org/mantis/view.php?id=6949
2014-03-25 09:36:53 +01:00
Oren Hurvitz
4289b71141
Fixed unit tests due to changes in the threadpool
2014-03-25 10:04:52 +02:00
Oren Hurvitz
e131e73652
Run slow operations in a separate thread, instead of using FireAndForget (which has a 1-minute timeout)
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:55 +01:00
Oren Hurvitz
84d7227dfd
Changed LogThreadPool to have 4 logging levels. Added console command "debug threadpool level" to set the logging level.
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:50 +01:00
Oren Hurvitz
b13214af27
Added a watchdog to abort slow threads in the main thread pool
...
If a task in the thread pool hangs then it will permanently take up
one of the threads. If this happens repeatedly then the thread pool will
become exhausted and OpenSim will fail. This watchdog terminates threads in the
thread pool that have been executing for over a minute (which probably
means they're hung).
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:45 +01:00
Oren Hurvitz
e735f76553
LogThreadPool: when the thread is for ProcessPacketMethod, also log the packet type
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:41 +01:00
Oren Hurvitz
4031933475
Refactored DebugFlagsEnum
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:37 +01:00
Oren Hurvitz
8555e54e22
Automatically start logging FireAndForget activity if the threadpool is full
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:32 +01:00
Oren Hurvitz
7c0ebcb984
Added debug flag: LogThreadPool. It makes us log every use of the main threadpool.
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:13 +01:00
Oren Hurvitz
89945f8829
Refactored: ExternalRepresentationUtils should be the only place where the "CreatorData" field is calculated, to ensure uniformity
...
Resolves http://opensimulator.org/mantis/view.php?id=6933
2014-03-24 18:00:59 +01:00
Oren Hurvitz
edc04d4184
When updating the CreatorId of an inventory item, automatically update the CreatorIdAsUuid field as well
...
Resolves http://opensimulator.org/mantis/view.php?id=6933
2014-03-24 18:00:39 +01:00
Oren Hurvitz
921f0052f4
Get the full viewer name even if it's (incorrectly) sent in the 'Channel' field
...
Recent versions of Firestorm and Singularity have started sending the viewer name in the 'Channel' field, leaving only their version number in the 'Viewer' field. So we need to search both of these fields for the viewer name.
This resolves http://opensimulator.org/mantis/view.php?id=6952
2014-03-24 12:26:52 +01:00
Dev Random
3d0778bcd6
Allow Mono Plugin Registry setting for Regions
...
Signed-off-by: Melanie <melanie@t-data.com>
2014-03-22 01:29:51 +00:00
Justin Clark-Casey (justincc)
47e7febebc
Add monitored thread last update times as stats in "show stats all"
...
These have the format server.thread.<thread-name>
2014-03-21 02:06:10 +00:00
Jak Daniels
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
Justin Clark-Casey (justincc)
cf97535d9e
Revert "Simplify DoubleQueue to eliminate redundant sempahore work."
...
This reverts commit 52b7b40034
.
Got the semantics wrong - the sempahore is required so that the blocking thread waits for a signal.
2014-03-19 01:40:56 +00:00
Justin Clark-Casey (justincc)
52b7b40034
Simplify DoubleQueue to eliminate redundant sempahore work.
...
Exclusion is already guaranteed by the lock on m_syncRoot.
Semaphore could not allow more than one thread in these sections anyway since the underlying SDK structures are not thread-safe.
2014-03-19 00:48:13 +00:00
Justin Clark-Casey (justincc)
9858766516
minor: Make "stats show" an alias for "show stats" command.
2014-03-19 00:35:49 +00:00
Justin Clark-Casey (justincc)
e6080a38c5
Rename "debug stats record" command to "stats record" for consistency. Move from debug to general command category
2014-03-19 00:29:36 +00:00
Justin Clark-Casey (justincc)
1d0a9e521c
Allow a snapshot of stats to be dumped to a file with a "stats save" command
2014-03-19 00:28:57 +00:00
Justin Clark-Casey (justincc)
fad1d70180
Add httpserver.<port>.QueuedPollResponses and httpserver.<port>.ProcessedPollResponses statistics
2014-03-18 23:47:33 +00:00
Justin Clark-Casey (justincc)
9e0d419239
minor: Correction to description of QueuedPollResponses since this covers long poll and other 'poll' types
2014-03-18 23:24:22 +00:00
Justin Clark-Casey (justincc)
eed343ed8a
Add httpserver.<port-number>,QueuedPollResponses stat
...
This shows the number pf poll responses queued for processing.
2014-03-18 23:21:07 +00:00
Justin Clark-Casey (justincc)
7df325c275
Extend locking in BlockingQueue to cover operations that are not guaranteed to be thread-safe
2014-03-18 23:05:49 +00:00
Justin Clark-Casey (justincc)
8ce3fa646b
Allow "show stats" console command to take a full stat name and display only that stat.
...
For example, scene.test.RootAgents will show only the RootAgents stat in the scene named "test"
2014-03-18 20:21:47 +00:00
Justin Clark-Casey (justincc)
c605c7a7b7
Lock m_syncRoot on DoubleQueue.Count. This is not documented as a thread-safe operation
2014-03-18 19:54:07 +00:00
Justin Clark-Casey (justincc)
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
Robert Adams
742f505440
Change terrain update sending to be triggered by frame tick rather
...
than everytime terrain is changed.
The TerrainModule now hooks the frame event and, if terrain has changed,
sends terrain updates to the clients. This polling pattern replaces
the previous push on change pattern and will make it easier to do per
client throttling and per scene presence terrain update ordering.
2014-03-10 22:05:18 -07:00
Justin Clark-Casey (justincc)
aa2fb1ec25
minor: Increase size of parcel name field in "land show" console command output. Construct table using CDT rather than string formats
2014-03-06 00:40:24 +00:00
Justin Clark-Casey (justincc)
4e6f7435d0
Add UUID and ready status (whether region has finished starting up) to "show regions" console output.
2014-03-05 01:23:48 +00:00
Justin Clark-Casey (justincc)
88b1fc1382
Set up a StreamReader and call ReadToEnd() instead of using the GetStreamString() extension method
...
This eliminates some stream seeking that was never necessary and makes disposable of the StreamReader consistent with other code
2014-02-27 23:13:26 +00:00
Justin Clark-Casey (justincc)
94ad69faf2
Remove long unused UntrustedWebRequest class
...
This purports to check web requests but doesn't appear to actually do that.
2014-02-27 22:58:44 +00:00
Justin Clark-Casey (justincc)
5fafea6631
refactor: More consistently use using construct within WebUtil to match other existing code there.
2014-02-27 22:52:43 +00:00
Justin Clark-Casey (justincc)
1f4f09ad69
Add more details to InvalidOperationException logging in SychronousRestFormsRequest.MakeRequest().
2014-02-27 20:35:56 +00:00
Dev Random
6955190c7d
Add Util method to load OpSys env vars
2014-02-26 23:39:45 +00:00
Justin Clark-Casey (justincc)
733e067958
Log information about which function, request data and agent ID triggered an XmlRpcGroupsServiceConnector error
2014-02-14 21:28:45 +00:00
Justin Clark-Casey (justincc)
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
Oren Hurvitz
b8e22f02e7
Make sure Web streams are disposed after use
2014-01-31 00:44:22 +00:00
Robert Adams
0c3493f619
clear land tainting when tested. Then testing, pass scene to LandObject as now needed to get region size
2014-01-28 16:25:01 -08:00
Robert Adams
d25265ae82
Fix terrain tests by properly initializing low detail terrain to zero height.
...
Also remove PI heightmap test as new heightmaps only have two significant digits.
2014-01-28 15:58:45 -08:00
Melanie
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
Melanie
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
Robert Adams
49af6b53e7
varregion: enable teleporting to a varregion by clicking on the map and
...
pressing the 'teleport' button.
This commit adds returning region map info for all the subregions of a
varregion. This also handles the selection of the extra region and then
the displacement of the postion so the teleport is to the correct location.
2014-01-26 19:32:28 -08:00
Robert Adams
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
Justin Clark-Casey (justincc)
2cf7478b9a
Merge branch 'justincc-master'
2014-01-20 19:34:55 +00:00
Justin Clark-Casey (justincc)
8e72b53edc
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
2014-01-20 19:16:19 +00:00
Oren Hurvitz
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default
...
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
2014-01-20 00:38:42 -08:00
Robert Adams
f127e4b4ee
Merge branch 'master' into varregion
2014-01-19 07:38:53 -08:00
Robert Adams
4fb3d314b8
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:37:14 -08:00
Robert Adams
08fa0a6a8a
Fix casting error for float type INI file parameter parsing.
2014-01-19 07:26:55 -08:00
Justin Clark-Casey (justincc)
d381da81d6
minor: Add method doc to IImproveAssetCache
2014-01-18 00:15:38 +00:00
Robert Adams
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
Justin Clark-Casey (justincc)
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
Oren Hurvitz
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
Justin Clark-Casey (justincc)
5e72de1908
Merge branch 'justincc-master'
2014-01-10 20:19:38 +00:00
Oren Hurvitz
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
Oren Hurvitz
13f31fdf85
Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory.
...
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
2014-01-10 19:37:59 +00:00
Melanie
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
Robert Adams
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
Robert Adams
d9848943a9
Add routines in Util.cs for conversion of region handles to region
...
locations and for the conversion of region world location to region
'region' location. These routines will replace all the arithmatic
scattered throughout OpenSimulator.
2014-01-04 19:01:03 -08:00
Robert Adams
9984ecf862
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
2014-01-03 07:41:06 -08:00
Robert Adams
6869633d76
Add serialization/deserialization of region size to RegionInfo, GridRegion, and RegionData.
...
This does not modify interfaces or handling of variable sized regions. This only
enables the loading and storing of the region size and the reporting of the
region size in grid service responses.
The database tables already have the code to load and store the region size.
2013-12-28 06:58:15 -08:00
Robert Adams
2d2bea4aa7
varregion: many more updates removing the constant RegionSize and replacing
...
with a passed region size. This time in the map code and grid services code.
2013-12-26 22:45:59 -08:00
Justin Clark-Casey (justincc)
e298bf41ff
Add missing viewer param elements for butt and breast physics.
...
Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
2013-12-19 01:24:36 +00:00
Robert Adams
6937eec258
Merge branch 'master' into varregion
...
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-17 06:18:13 -08:00
Robert Adams
13a9a4b653
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
...
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
2013-12-14 07:53:01 -08:00
Justin Clark-Casey (justincc)
38d7d46c17
Merge branch 'justincc-master'
2013-12-14 02:33:08 +00:00
Kevin Cozens
957449e62c
ParseNotecardToList() returned data past end of notecard text (mantis #6881 ).
2013-12-14 02:25:28 +00:00
Justin Clark-Casey (justincc)
ee163b5751
Merge branch 'justincc-master'
2013-12-14 02:23:12 +00:00
Justin Clark-Casey (justincc)
996a6c2eea
After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning
...
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
2013-12-14 01:34:28 +00:00
Melanie
92aad6f1bb
Add missing files *blush*
2013-12-11 01:44:03 +00:00
Melanie
5b73b9c4a8
Committing the Avination Scene Presence and related texture code
...
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
2013-12-11 01:39:56 +00:00
Melanie
958a8f274b
Revert "Add support for user preferences (im via email)"
...
This reverts commit 1842388bb4
.
2013-12-07 01:29:15 +00:00
Melanie
ba48816fb6
Merge branch 'master' into careminster
2013-12-07 01:19:20 +00:00
BlueWall
1842388bb4
Add support for user preferences (im via email)
2013-12-06 02:52:13 -05:00
Robert Adams
6cd0d7a62b
varregion: Add MaxRegionSize constant and enforce in RegionInfo.
...
Intermediate checkin of changing border cross computation from checking
boundry limits to requests to GridService. Not totally functional.
2013-11-30 15:28:39 -08:00
Robert Adams
7aa00632b9
varregion: many replacements of in-place arithmetic with calls to
...
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
2013-11-28 08:20:16 -08:00
Robert Adams
3193bcaae1
Merge branch 'master' into varregion
2013-11-24 07:23:12 -08:00
Melanie
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
f9984a9685
rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code
2013-11-19 23:39:52 +00:00
Justin Clark-Casey (justincc)
b71952df49
Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has been set.
...
Continue to return null instead.
2013-11-19 23:36:44 +00:00
Latif Khalifa
9ba5a7e190
Normalize viewer version string to accomodate new style version reporting in the viewers
2013-11-19 23:29:10 +00:00
Robert Adams
604b39cea9
Merge branch 'master' into varregion
2013-11-15 14:56:13 -08:00
Justin Clark-Casey (justincc)
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
Robert Adams
c12e68e34d
varregion: fix GetLandObject error return and initialization of square
...
land object bitmaps. This fixes creation of child presences and the
editing of parcels.
Also lots of commented out debugging messages.
2013-11-10 19:52:31 -08:00
Robert Adams
beeec1c467
varregion: elimination of Constants.RegionSize from all over OpenSimulator.
...
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
2013-11-08 20:53:37 -08:00
Melanie
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
Robert Adams
d0854e4ace
varregion: properly sense size of terrain heightmap and store as
...
compressed 2D database blob if a varregion.
2013-11-05 21:33:02 -08:00
Robert Adams
c931b16c1f
Merge branch 'master' into varregion
2013-11-04 22:12:57 -08:00
Melanie
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
Robert Adams
f66737fe56
varregion: Enforce the configuration of square regions in RegionInfo.cs.
2013-11-02 15:36:16 -07:00
Robert Adams
92c06a5d0b
varregion: fix lawn-mower terrain fill so it works for non-square regions.
...
Add some debugging logs on region creation to report region size.
2013-11-01 16:37:27 -07:00
Robert Adams
976530569a
varregion: enforce multiple of 256 for region size when parameters fetched from user.
...
Output info and warning messages for non-legacy region sizes.
2013-11-01 16:06:19 -07:00
Robert Adams
ff5885ab23
varregion: push TerrainData implementation up and down the database storage stack.
...
Implement both LoadTerrain and StoreTerrain for all DBs.
Move all database blob serialization/deserialization into TerrainData.
2013-11-01 11:35:31 -07:00
Robert Adams
39777db8ef
varregion: fix problem of X/Y dimensions swapped and incorrect terrain
...
compression base computation.
Complete replacement of float[] for terrain heightmap with TerrainData instance.
2013-10-31 09:24:06 -07:00
Justin Clark-Casey (justincc)
39de7614ec
Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section.
...
These are long unused but confusingly will be seen in the [Startup] section on a "config save".
2013-10-28 18:03:34 +00:00