ddcb88ff53
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-17 01:45:41 +01:00
0c041ce12f
Implement osNpcSit(). This is still in development so don't trust it
...
Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE)
e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE);
At the moment, sit only succeeds if the part has a sit target set.
NPC immediately sits on the target even if miles away - they do not walk up to it.
This method is in development - it may change so please don't trust it yet.
Standing will follow shortly since that's kind of important once you're sitting :)
2011-10-17 01:42:31 +01:00
730460169f
Bug fix on the bug fix on UserAccountService.cs
2011-10-16 16:13:24 -07:00
bbd0e68c06
Guard HGAssetService against uninitialized variables and null arguments.
2011-10-15 20:23:26 -07:00
b9930a6305
improve method doc on Scene.OtherRegionUp()
...
this is really just to trigger panda.
2011-10-15 03:17:58 +01:00
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
2011-10-15 02:47:27 +01:00
3843efe478
Restore [Startup] physical_prim flag which can stop any prims being subject to physics
...
This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed.
Default for this flag is true as previously.
2011-10-15 02:42:43 +01:00
f2889d7ce9
remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate()
2011-10-15 02:12:46 +01:00
732e937379
refactor: Remove redundant code in SOP.UpdatePrimFlags()
2011-10-15 02:07:05 +01:00
c93c9ea072
factor common code out into SOP.RemoveFromPhysics()
2011-10-15 02:02:39 +01:00
978fb3d482
reduce access to ODECharacter methods to make code analysis easier. Eliminate redundant argument on ProcessTaints()
2011-10-15 01:41:39 +01:00
9cc2694776
restrict unnecessary access levels on ODEPrim fields/properties
2011-10-15 01:31:09 +01:00
f2132329a3
refactor: make methods that do not need to be public in ODE private or internal to aid code reading/analysis. Remove some unused method arguments
2011-10-15 01:20:40 +01:00
4bfc2f5cde
Change hardcoded ODE total frame time to match the default total frame time (0.09375 -> 0.089).
...
No apparant ill effects - because the default stepsize is 0.2, there are still 5 physics steps per physics frame.
This is a precursor to using the elapsed value passed in (and now changeable in config).
2011-10-14 21:07:57 +01:00
83c7b9b609
Bug fix -- Test User on first run standalone might not be created properly: let all instances of UserAccountService have all its service references properly initialized, and register console commands on only one.
2011-10-13 18:03:19 -07:00
aa19ccf65c
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
2011-10-14 01:45:46 +01:00
77c65951e0
Extract NullPhysicsScene from PhysicsScene to improve code readability
2011-10-14 01:38:14 +01:00
ee84c0589c
Don't execute rest of code in XEngine.RemoveRegion() and Close() if the module is disabled.
2011-10-14 01:06:43 +01:00
4e7d4330c2
Expose minimum frame time and update periods for experimentation.
...
Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change
Defaults are the same as previously.
More information to come on opensim-dev shortly.
Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested.
2011-10-13 23:47:37 +01:00
128d8dfd8b
refactor: Put the frame update period when temporary objects are cleaned up in a field, like all the other update periods
2011-10-13 22:28:42 +01:00
fd274a6688
refactor: chain the two scene constructors together to eliminate more copypasta
2011-10-13 22:21:03 +01:00
a6fa15e8b6
Tie reported FPS correction factor into the minimum frame time rather than setting separately.
...
This makes reported FPS scale as required if min frame time changes
2011-10-13 22:07:55 +01:00
ceb326284e
Move fps stat adjustment factor into field rather than hard-coded.
2011-10-13 21:55:51 +01:00
20da04fd0c
More method doc and formatting changes. Makes DestroyOdeStructures() private
2011-10-13 21:42:24 +01:00
227db07f2f
refactor: move 3x copy/pasted ode structure removal code in ODECharacter into a DestroyOdeStructures() method
...
also adds some method doc
2011-10-13 18:19:13 +01:00
f08664f422
remove some mono compiler warnings
2011-10-12 21:54:25 +01:00
631d5e16ef
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
f5f7ca47ea
Bring LindenUDP.Tests back from the dead. No tests are running.
...
Code drift means that most of this stuff doesn't compile but the structure is still useful.
2011-10-12 21:31:22 +01:00
ea7366ddc6
When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting.
2011-10-12 19:42:04 +01:00
c5826d589a
minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks
2011-10-12 19:35:40 +01:00
36e73dbc9b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-12 19:24:03 +01:00
f9ffd2538f
Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection
2011-10-12 19:22:30 +01:00
4b7b9e81f7
Make it possible to disable the HG linker. On non-HG systems it spits yellow
...
spam, so it should not load unless HG is desired.
2011-10-12 15:41:59 +01:00
ca74088d94
Change default groups messaging module in hardcode to the empty string.
...
Modules should not assume thet they are the one and only, but only be
enabled when explicitly configured.
2011-10-12 09:21:46 +01:00
fe3594c5ea
Start recording object updates per second statistic (analogue of agent updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor
...
A useful diagnostic to find out how object updates are burdening a scene
2011-10-11 22:17:05 +01:00
f138a2056e
meaningless change to goose panda
2011-10-11 00:29:41 +01:00
28f549bd64
osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE
...
this new flag set parcels claim date
value 0 for this flag set current unixstamp
http://opensimulator.org/mantis/view.php?id=5725
2011-10-11 00:13:26 +01:00
353e7ce873
Allow monitoring of stats by region name
2011-10-10 23:58:27 +01:00
62aad4c18f
Add other region stats (total frame time, physics fps, etc.) currently missing from MonitorModule
...
Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful.
This doesn't affect an of the existing monitored stats.
2011-10-10 23:48:53 +01:00
19096bd391
Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter
2011-10-10 22:23:42 +01:00
8114f895c2
Provide a way to turn the MonitorModule on and off
...
Default is currently on since this is the historical setting
2011-10-10 22:17:29 +01:00
2b290793ab
refactor: have lsl and ossl interrogate scene.StatsReporter directly rather than going through scene
...
I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods
2011-10-10 21:54:08 +01:00
013bf2775f
remove unused LastAssetID from DynamicTextureUpdaer
2011-10-10 15:19:23 +01:00
156385f48b
Tweak to language of last commit in rejecting UUID.Zero in GridService.RegisterRegion()
...
Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426
It's probably a bad idea to allow these in any case.
2011-10-08 02:15:04 +01:00
a6c5e00c45
GridService - Region UUID can not be NULL
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-08 02:13:18 +01:00
29660fe175
Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() check on XMLRPC RemoteAdmin handlers.
...
If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway.
2011-10-08 02:00:36 +01:00
71d29decc8
replace List used by m_accessIP in RemoteAdminPlugin with the more efficient HashSet
2011-10-08 01:53:10 +01:00
4073cd6ced
Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
...
Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus.
2011-10-08 01:23:26 +01:00
ff80113534
Go back to lying that sim fps is 55 when it's actually locked at a maximum of 11.
...
We're been lying since 2008 so I'm sure another few years can't hurt.
To know the real fps, either divide sim fps by 5 and/or look at the frame time.
2011-10-08 00:15:15 +01:00
f8c06c6114
flip master version up to 0.7.3
2011-10-07 23:41:55 +01:00
1c54817977
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-07 16:36:43 -04:00
a9b3ab0c85
Add note to docs
...
This method is used by externasl/3rd party management tools to
create users and they depend on us to generate the UUID.
2011-10-07 16:34:33 -04:00
e3c522e211
Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message
...
As per earlier discussions with dslake
2011-10-07 20:51:26 +01:00
4b46b7a5ad
Fixed line endings from previous commit
2011-10-06 23:20:51 -07:00
f26a966b8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-06 22:50:03 -07:00
4748c19bdb
Refactored "known child region" in ScenePresence. There were 4 different
...
ways to access the list/dictionary of child regions and locking was
inconsistent. There are now public properties which enforce locks.
Callers are no longer required to create new copies of lists.
2011-10-06 22:47:33 -07:00
1f78dc6504
remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms.
...
Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/
Can't do this with webstats yet since it does insane things to the path.
2011-10-07 00:30:35 +01:00
4c812884be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-06 23:47:41 +01:00
95910f03d4
WebStats - Home Link Fix
...
http://opensimulator.org/mantis/view.php?id=4536
2011-10-06 22:30:24 +01:00
9a16e76f51
Simplified IsInTransit property on ScenePresence and removed InTransit() which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
2011-10-06 12:39:19 -07:00
08f264d096
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-06 12:22:15 -07:00
bd9ba904c3
Refactor ScenePresence so gets and sets are through properties. Added private sets when needed. Removed redundant code when methods replicated what the set already does
2011-10-06 12:19:31 -07:00
77b8fb0f86
Added back UserAccount that creates random UUID for new account.
...
This should fix recent issues with 3rd party apps that use the
old interface w/o breaking the new one.
2011-10-05 22:01:12 -04:00
ca83f99332
Instead of adding stat agentMS in all kinds of places, calculate it instead in the main Scene.Update() loop, like the other stats
...
Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time.
Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats.
These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time
2011-10-06 00:45:25 +01:00
7fa1c979cf
rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not a single one
2011-10-05 23:36:27 +01:00
8a8983b3d4
Add user ID to new estate user prompt, to make it clearer and consistent with the main create user prompts
2011-10-05 23:34:18 +01:00
604708fc96
Change WebStatsModule to check its config properly, instead of catching the ineviable NullReferenceException!
...
Also, tidy up spacing.
2011-10-05 23:31:53 +01:00
9090039324
Remove unused local variable i from OdeScene.Simulate()
2011-10-05 22:15:28 +01:00
7d033187d8
Make reported sim fps more accurate, in line with frame time ms
...
Also remove some unused fields and improve naming on others.
2011-10-05 22:08:56 +01:00
3142982353
Removed redundant scene presence lookups in HGMessageTransferModule
2011-10-05 12:58:24 -07:00
38d205502a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 16:59:35 -07:00
146322eb34
Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree objects already triggers objectkill packet to client. No need to send again.
2011-10-04 16:59:05 -07:00
9a49b3b519
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 23:53:30 +01:00
b907a66f39
When creating a new user on the comand line, give the option of allowing a UUID to be specified to override the randomly generated one.
...
This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
2011-10-04 23:48:35 +01:00
413e299045
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-04 15:44:22 -07:00
b229a72a5f
Turn off keepalives when commands are specified
2011-10-04 15:43:41 -07:00
92c88121c7
Removed all refs to IClientAPI from IAttachmentsModule. Separated client handlers for attachments to call public interface and rearranged module file into sections
2011-10-04 14:40:39 -07:00
bfa405e6f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 16:45:04 -07:00
460946ad62
Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still.
2011-10-03 16:44:32 -07:00
c7d0d71666
trival tweak to trigger the continuous integration system
2011-10-04 00:37:02 +01:00
b98442dcec
Animation-States Turning Left, Turning Right implemented/enabled
...
http://opensimulator.org/mantis/view.php?id=3036
2011-10-04 00:27:11 +01:00
a8af0a5ba8
Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather than ""
...
As per http://wiki.secondlife.com/wiki/LlGetTexture
2011-10-04 00:15:48 +01:00
8a6e6866d9
For llGetTexture(), if the face texture asset is in the inventory, return the inventory name rather than the asset UUID
...
This is as per http://wiki.secondlife.com/wiki/LlGetTexture
Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early.
Thanks Michelle Argus!
2011-10-04 00:07:52 +01:00
34026887fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 23:26:52 +01:00
37ae6451f9
Remove vestigal RegionStatus.SlaveScene.
...
This appears to be code clutter since the code that uses this has long gone.
2011-10-03 23:25:09 +01:00
e77c919290
Remove usage of Linden packet types from inside Attachments Module and interface
2011-10-03 11:55:54 -07:00
56dbab35e1
Remove unimplementated UpdateMovement() methods from SOG, SOP.
...
SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase.
No point making the code more complex until it actually needs to be,
2011-10-01 01:26:50 +01:00
42fe774ad1
Remove OpenSim.Region.Examples.SimpleModule
...
This module is more than 2 years old and at least some of the 'example' code it gives is now misleading.
Even the logs say it say some bits were broken where it was put in!
2011-10-01 01:21:20 +01:00
c7db3df344
llGetLinkKey, llGetLinkName Fix for sitting Avatar
...
when an avatar sits on a prim, we get now his key & name ;-)
http://opensimulator.org/mantis/view.php?id=4476
2011-10-01 00:41:47 +01:00
a1875ec760
Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin
...
Applies patch in http://opensimulator.org/mantis/view.php?id=5686
Thanks Michelle Argus!
2011-10-01 00:19:09 +01:00
246443773a
minor: remove clutter null check from pass in config to AvatarFactoryModule.Initialize()
...
This is never null
2011-10-01 00:15:30 +01:00
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
528fcede6c
llAvatarOnLinkSitTarget Implementation
...
http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
2011-09-29 01:08:05 +01:00
a3531dec1a
Add en_US culture setting to the async delete to inventory thread, to avoid any issues with float serialization with machines set to non en_US locales.
...
Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708 , though if it does I'm really surprised not to have seen it before now.
Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead.
But don't want to do something like that this close to a release.
2011-09-26 23:00:16 +01:00
2b2580e3a1
Fix for rezzing and derezzing HUDs (see Mantis #5406 ). From now on updates are only sent to affected clients.
2011-09-25 00:51:43 +02:00
8caf3ed49e
Remove the unimplented "clear assets" command.
...
This was a bizarre relic of a bygone age that had no implementations.
If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command
2011-09-24 02:22:47 +01:00
e789ab659c
Removed uncalled region load method.
...
The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module.
2011-09-24 02:06:34 +01:00
39d7945efc
Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.
...
I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
2011-09-24 01:59:02 +01:00
c14c4bc1ec
Don't try and resolve user account for authorization if the agent has come in via hypergrid.
...
If a user account isn't available, this just passes on the name given by the agent instead.
I'm not sure this is particularly useful since I believe that agent names could be faked in this context - it might be no more useful than a viewer agent string.
In fact, there might even be an argument that passing on this name provides a false expectation of authenticity. However, I will apply for now.
Patch applied from http://opensimulator.org/mantis/view.php?id=5696
Thanks Michelle Argus.
2011-09-24 01:39:37 +01:00
839c1cdcc4
Improve locking when access queue in EventQueueGetModule
2011-09-24 01:10:23 +01:00
bec0cbe82b
remove unused SOP.Create() method
2011-09-23 22:20:15 +01:00
c8304b7f84
Fix avatar parameter updating for viewer 3 and maybe 2.
...
When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it.
Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated.
However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded.
This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place.
A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one.
This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
2011-09-23 02:59:33 +01:00
41616cad09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-09-22 01:11:19 +01:00
3ccb58c05c
Fix failure to teleport when an agent is lured on the same sim (and probably in neighbouring sims) with HG lure active
...
It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar.
However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour.
We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690
2011-09-22 01:08:38 +01:00
28a482a7ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-09-21 16:24:48 -07:00
2c0bb8118d
Commented out new debug statements in ScenePresence
2011-09-21 16:24:19 -07:00
d358125cac
Reinstate option to land an npc when it reaches a target.
...
This is moved into ScenePresence for now as a general facility
2011-09-22 00:16:05 +01:00
241e07d006
Move code which handles NPC movement into Scene so that this can also be used by Autopilot coming from the client side.
...
I thought that I had implemented this but must have accidentally removed it.
Adds a regression test to detect if this happens again.
Temporarily disables automatic landing of NPC at a target. Will be fixed presently.
2011-09-21 23:56:11 +01:00
f9438e7147
Remove unused and never set SP.PreviousRotation
2011-09-21 22:01:57 +01:00
572b680cb0
get rid of an incredibly noisy logging message from the last commit
2011-09-21 20:15:06 +01:00
c9c40343af
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-09-21 20:05:11 +01:00
8159fd7110
When calling osNpcMoveTo(), rotate the avatar in the direction of travel.
...
This stops the npc walking backwards if the target is directly behind.
This means that the npc no longer returns to its original rotation once movement has finished.
If you want this behaviour, please store and reset the original rotation after movement.
This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678
2011-09-21 19:28:41 +01:00
7ec7a3cf33
Null simulation data must return a non-null region settings or other parts of the simulator expect
2011-09-20 15:35:36 -07:00
7829b7a601
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-09-20 14:07:41 -07:00
fa9291512a
Make debug statements in ScenePresence consistent and add a few more
2011-09-20 14:07:10 -07:00
aadf7dd91c
Remove vestigal OpenSim.Data mono addins extension points that don't look like they've been active for at least 2 and a half years
2011-09-20 20:56:32 +01:00
1e798136c3
adjust some whitespace to trigger another build, to check the last failure was just a glitch
2011-09-17 01:33:55 +01:00
f950338124
Remove old bullet DotNET and X libraries in preparation for BulletS
...
These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
2011-09-17 01:09:25 +01:00
385c4a210d
On setting a new avatar appearance, if height hasn't changed then don't set that same height in ScenePresence.
...
This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself
2011-09-17 00:26:53 +01:00
6f542f73d4
Stop the avatar stalling on its first boarder cross when using the ODE plugin
...
When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor.
This in turn reset Velocity, which cause the border stall.
I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose
2011-09-16 23:57:16 +01:00
adfe713b43
minor: I was wrong about OffsetPosition - sometimes it genuinely does return offset position!
...
Add method doc to explain this.
2011-09-16 22:55:24 +01:00
b2356340d2
Remove setter from SP.OffsetPosition, since all sets should flow through SP.AbsolutePosition
...
OffsetPosition is also misnamed - it returns the absolute position and never contains an offset.
2011-09-16 22:51:36 +01:00
c695e23dd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-09-16 21:06:09 +01:00
903d5c02cb
Updated some variables to be closer to the coding standards (and easier to understand).
...
There were a few variables in LocalConsole with single character names, and the class fields did not use the m_ prefix.
I also removed a redundant variable, h. It was being set to 1 in a couple of places, and incremented in another, but never actually used.
2011-09-16 20:24:47 +01:00
30b6838837
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-09-16 19:56:14 +01:00
a00327d0e5
Fix build errors on Windows by adding missing OpenSim.Services.Base reference
2011-09-16 19:54:23 +01:00
923f2459cf
Passwords could be revealed in console by pressing backspace.
...
Pressing backspace causes hidden input (such as passwords) to be revealed on the console. The echo state was not being taken into account when handling a backspace key press.
2011-09-16 19:25:38 +01:00
d4043c084a
MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore and InventoryStore
2011-09-16 19:09:46 +01:00
1458fab82c
Reattaching a region was failing if the estate name had not changed (issue 5035).
...
Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
2011-09-16 18:50:25 +01:00
9046651583
Pass any region scope through to the CreateUser() method
2011-09-16 00:36:43 +01:00
4ae4b14b5d
refactor: move estate owner setup code into separate method
2011-09-16 00:24:23 +01:00
522d6261f1
Correctly create a freshly created estate owner's default items and avatar entries on standalone if applicable.
2011-09-16 00:12:12 +01:00
c4efb97d49
Write code to create minimum necessary body parts/clothing and avatar entries to make a newly created user appear as a non-cloud on viewer 2
...
Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries.
Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim.
Default is currently off. My intention is to switch it on for standalone shortly.
This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities.
Need to fix creation of suitable entries for users created as estate owners on standalone.
Avatars still appear with spooky empty eyes, need to see if we can address this.
This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461 ) which can be used.
2011-09-15 22:59:29 +01:00
de19dc3024
refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to reflect what it actually does
...
This also makes it consistent with some other methods that send data to the client.
2011-09-15 18:58:58 +01:00
a4cc5f628f
Only bother to create an inventory xfer file if there are any items in a prim inventory
2011-09-15 18:42:10 +01:00
8fb3e71b14
Shuffle order of code in invnetory connector GetFolderContent() calls to avoid a possible race condition
2011-09-15 18:36:22 +01:00
42f1b88eb2
If a prim inventory becomes empty through deletion, send an empty xfer file name rather than one that references a metadata file containing only the folder object.
...
If we do this, then viewer 3 crashes when we try and rez a script directly in an attachment's prim inventory.
Sending an empty file name was already being done if the prim's inventory had never been touched.
Now we always do that if there are no items in that inventory.
Hopefully addresses the remaining point in http://opensimulator.org/mantis/view.php?id=5644
2011-09-15 18:13:36 +01:00
bd991fc95f
Don't try and delete attachments for child agent close
2011-09-13 22:54:50 +01:00
1084d8f6a2
Remove code from DetachSingleAttachmentToInv() that sets group changed on all parts, now that we're performing this check in UpdateKnownItem() for other purposes
2011-09-13 22:39:06 +01:00
61affee814
remove redunant itemID and agentID arguments from UpdateKnownItem().
...
itemID is always taken taken from the group's stored item id, and agentID is never used.
2011-09-13 22:33:15 +01:00
2d62484f11
Remove UpdateKnownItem() from IAttachmentsModule.
...
It's not appropriate for code outside the attachments module to call this.
2011-09-13 22:27:33 +01:00
62b3e74bc5
minor: remove redundant grp != null check from AM.UpdateKnownItem()
2011-09-13 22:24:33 +01:00
8880aea728
Stop attempts to rewear already worn items from removing and reattaching.
...
Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process.
This change ignores those attempts.
This stops script failures during login, as the rewearing was racing with the script startup code.
It might also help with attachments being abnormally put into deleted state.
Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644
2011-09-13 22:13:58 +01:00
618277e797
Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID itemID) for now
...
As far as I can see, this is only invoked by a PUT request to ObjectHandlers, which is not being used anyway.
Invoking attachments code at this point is probably inappropriate since it would still be invoked when the client entered the scene.
Being commented to simplify analysis of attachments issues. Can be uncommented when in use.
Also, small tweak to lock and log removal of a SOG from the SceneObjectGroupsByLocalPartID collection in SceneGraph.GetGroupByPrim() if an inconsistency is found.
2011-09-13 20:25:32 +01:00
df73833a2c
stop the duplicate remove of the root part ids from the full part and local part indexes in SG.DeleteSceneObject()
...
this is unnecessary because the parts array iterated through contains the root part as well as the non-root parts
2011-09-13 18:11:13 +01:00
f09a90d8a7
extend TestGetSceneObjectByPartLocalId() to test state after scene object deletion
2011-09-13 18:08:05 +01:00
07ba28f1de
In SG.AddSceneObject(), stop unnecessarily adding the root part to object indexes sepearately from the other parts.
...
The SOG.Parts property contains the root part as well as the non-root parts
2011-09-13 17:56:02 +01:00
c14f0a22d4
Add new TestGetSceneObjectByPartLocalId() for retrieving a scene object via the local id of one of its parts
2011-09-13 17:52:10 +01:00
88bd71b978
improve TestAddSceneObject() to test a multi-part object rather than a single-part
2011-09-13 17:40:39 +01:00
306af9934a
In an object return message, send a null-terminated empty string in binary bucket to prevent a viewer 3 crash.
...
This is the message sent to the client when the object is returned.
We were sending byte[0] in the binary bucket. This didn't kill viewer 1 but did terminate viewer 3 (don't know about viewer 2).
So sending "\0" instead.
This is to address http://opensimulator.org/mantis/view.php?id=5683
2011-09-13 17:13:42 +01:00
dea0935361
eliminate redundant SP.m_regionInfo since it always has the scene.
...
We were already referencing through the scene in some places.
2011-09-12 23:00:15 +01:00
62b2450529
remove the unused SP.initializeScenePresence()
2011-09-12 22:54:54 +01:00
56cd7d9685
stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is always passed in at the same time.
2011-09-12 22:51:56 +01:00
00f8946bd4
minor: if the script engine fails to find a prim for a script, also print out that prim's local id in the error message.
2011-09-12 22:44:14 +01:00
294120c9d3
comment out some recent terrain texture logging
2011-09-12 22:26:04 +01:00
ea0f78c971
Start locking entire add/remove operations on an IScenePresence.AttachmentsSyncLock object
...
Attach and detach packets are processed asynchronously when received from a viewer.
Bugs like http://opensimulator.org/mantis/view.php?id=5644 indicate that in some situations (such as attaching/detaching entire folders of objects at once), there are race conditions between these threads.
Since multiple data structures need to be updated on attach/detach, it's not enough to lock the individual collections.
Therefore, this commit introduces a new IScenePresence.AttachmentsSyncLock which add/remove operations lock on.
2011-09-12 21:57:22 +01:00
dab6387bba
lock AvatarAppearance.m_attachments when we use it
...
This is partly to address http://opensimulator.org/mantis/view.php?id=5644 , though something more thorough is needed.
2011-09-12 21:05:26 +01:00
7f318277f1
When creating an OAR, optionally exclude objects according to their permissions
2011-09-12 20:09:24 +01:00
517932722b
minor: put <remarks> tags around some method doc
2011-09-12 20:06:09 +01:00
728fd0b1b8
lock attachments when enumerating through them in ScenePresence.CopyTo().
...
May have some effect on http://opensimulator.org/mantis/view.php?id=5644
2011-09-10 01:09:17 +01:00
9c32b131fd
Add extra log information when attachments fail validation
2011-09-10 00:57:52 +01:00
7531851bec
reinstate the validation logging on teleport. A 'fail' of validation still doesn't prevent the actual teleport.
2011-09-10 00:45:50 +01:00
de28c9cd24
Stop the UserManagementModule logging every user it adds for now
2011-09-10 00:23:52 +01:00
1dd904b78e
Delay loading scripts until the scene has finished loading
2011-09-09 23:01:05 +01:00
7cafc2e46e
Added a check to the CreateRegion method of the RemoteAdmin module that the specified user exists.
...
A meaningful exception message is returned if the user is not found. Previously it was returning "Object not set..."
2011-09-09 22:59:00 +01:00
28961dd1cf
llSetPrimitiveParams Prim type params precision errors
2011-09-09 22:53:45 +01:00
bea2e0f32b
Comment out the part of the load oar code that zeroes out prim sit target orientations and positions.
...
The warning about these causing problems is very old and may no longer apply.
Hopes to fix http://opensimulator.org/mantis/view.php?id=5680
2011-09-09 22:50:54 +01:00
655935db49
Use a copy of the inventory items list to register users in the thread started by GetFolderContent(), to protect ourselves against callers modifying lists
...
Hopefully this addresses http://opensimulator.org/mantis/view.php?id=5681
2011-09-09 19:55:30 +01:00
42790f021f
Fix unit tests from RegionSettings commit
2011-09-09 00:47:23 +01:00
086bf9f15d
Save the default terrain texture UUIDs for a new region instead of leaving them as UUID.Zero.
...
Leaving them at UUID.Zero meant that when a viewer 2 logged into a region that had been freshly created, it received UUID.Zero for these textures, and hence display the land as plain white.
On a simulator restart, the problem would go away since when the database adapators loaded the new region settings, RegionSettings itself has code to use default textures instead of UUID.Zero.
This commit resolves the problem by saving the default texture UUIDs instead of Zero.
However, we currently have to do this in a roundabout way by resaving once the RegionSettings have been created by the database for the first time. This needless complexity should be addressed.
This change will also have the effect of replacing any existing UUID.Zero terrain textures with the default ones.
However, this shouldn't have any effect since the UUID.Zeros were already being replaced in memory with those same UUIDs.
2011-09-09 00:38:04 +01:00
f5eace6781
Fix test failure. Oversight in setting up the tests themselves.
2011-09-08 21:54:40 +01:00
9615292133
Centralize module setup for NPC tests.
...
This is overkill for some tests since they dont' need all the modules, but I think the gain in code readability is worth it
2011-09-08 21:06:10 +01:00
96a3b68086
Remember to set and unset the fire and forget method at the top of the attachment and npc tests
2011-09-08 20:59:52 +01:00
bd5d2cb043
Use scene presence agent id for rezzed object ownership rather than item owner.
...
These should be identical. However, the item isn't available when rezzing npc attachments.
2011-09-08 20:51:52 +01:00
3e7960d161
Increase information in logging for UserAgentServiceConnector.
...
Done for http://opensimulator.org/mantis/view.php?id=5669
2011-09-08 19:52:28 +01:00
08bd16285d
When invoking any of the OSSL teleport functions, do it on a separate thread rather than the script thread.
...
This is to prevent the aborting of attachment script threads on teleport from aborting the one actually doing the teleport.
This allows OSSL teleport functions to work when invoked on scripts in attachments (and huds, I assume)
2011-09-07 23:55:41 +01:00
7cadb89a0f
When a region is added to the HG Inventory Broker, also pass this through to the embedded local inventory connector to prevent an NRE when that connector tries to lookup the UserManager through the scene.
...
This is to address http://opensimulator.org/mantis/view.php?id=5669
However, if this failure was happening I'm kind of surprised that local HG inventory was working at all.....
We probably weren't seeing these exceptions previously because we weren't logging them when the reached the top of a FireAndForget thread.
2011-09-07 23:16:19 +01:00
d7a516d885
Add temporary debugging in HGInventoryBroker and RemoveXInventoryServiceConnector
...
This is for http://opensimulator.org/mantis/view.php?id=5669
If we can't retrieve an IUserManagement module we complain, and we also warn in the log when its manually set in XISC by HGInventoryBroker
2011-09-06 23:16:37 +01:00
e6cd4defdb
Lock m_pendingObjects when calling GetPendingObjectsCount().
...
This is only called by a region console command.
We should also be locking m_partsUpdateQueue when dequeueing the next part, or locking m_pendingObjects in QueuePartForUpdate().
However, I won't do this now since I don't have time to analyze how this would affect liveness.
2011-09-06 22:48:05 +01:00
3d4d3427cd
Comment out SceneViewer.Reset() and stop calling from Close() since this is useless work as a closed scene object is never reset.
...
Strictly speaking, we could also stop bothering to clear the m_updateTimes and m_partsUpdateQueue if we are sure that the whole SceneViewer is shortly to be garbage collected anyway, but we'll leave them around for now.
2011-09-06 22:44:34 +01:00
405a5b097b
Comment out unused ISceneViewer.Reset() to reduce code complexity
2011-09-06 22:39:01 +01:00
4bf3adffb8
In SceneViewer, introduce an IsEnabled flag and perform Close() under an m_pendingObjects lock in order to avoid the race condition seen by danbanner in http://opensimulator.org/mantis/view.php?id=5669
2011-09-06 22:26:28 +01:00
1a8f5b97b9
refactor: Make logic in AM.AttachObject() clearer by not reusing existing variables in different contexts
2011-09-06 02:40:19 +01:00
5beee42809
rename AM.AddSceneObjectAsAttachment() to AddSceneObjectAsNewAttachmentInInv
2011-09-06 02:29:22 +01:00
b903d2ca96
In SetAttachment, if the existing attachment has no asset id then carry on rather than abort.
...
When a user logs in, the attachment item ids are pulled from persistence in the Avatars table. However,
the asset ids are not saved. When the avatar enters a simulator the attachments are set again. If
we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments
later fail unless the attachment is detached and reattached.
Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
2011-09-06 01:59:21 +01:00
c6ec573d10
Get rid of the confusing version of IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false
2011-09-06 00:36:38 +01:00
05a4bedc30
get rid of the unused AttachmentsModule.ShowAttachInUserInventory()
2011-09-06 00:32:52 +01:00
0cb0140a1d
Stop the pointless double setting of every attachment in AvatarAppearance.
...
The second was already being filtered out so this has no user level effect
2011-09-06 00:29:37 +01:00
cf73afec35
Try disabling the inconsistent attachment state check to see if this actually has an impact.
...
The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary.
This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message.
This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672
2011-09-05 23:42:37 +01:00
5e579b71fd
Allow the HGInventoryBroker to set the UserManager when it instantiates a RemoteXInventoryServiceConnector for a visiting HG user.
...
Not doing this causes NREs whenever that user tries to access inventory when Hypergrid is turned on since the Remote connector does not have a scene (which is only used to fetch the UserManager)
Aims to address http://opensimulator.org/mantis/view.php?id=5669
2011-09-05 22:55:48 +01:00
5c1fa968ab
Stop NPCs losing attachments when the source avatar takes them off.
...
This was happening because we were using the source avatar's item IDs in the clone appearance.
Switch to using the asset IDs of attachments instead for NPCs.
The InventoryAccessModule and AttachmentModule had to be changed to allow rezzing of an object without an associated inventory item.
Hopefully goes some way towards resolving http://opensimulator.org/mantis/view.php?id=5653
2011-09-03 01:11:16 +01:00
e6eb0d9a6f
Comment out Scene.CleanDroppedAttachments() and calls.
...
This method wasn't actually doing anything since dropped attachments retain a PCode of 9.
Also, behaviour of dropped attachments in other places appears to be that they persist after avatar logout rather than get deleted.
2011-09-02 23:19:27 +01:00
dbcfb25a52
Remove redundant RootPart.CreatedSelected = true in IAM.RezObject() since this is done through parts iteration
2011-09-02 22:54:03 +01:00
26b471f25a
Go back to resetting the State parameter for all parts of a SOG when SOG.ClearPartAttachmentData() is called.
...
Even though we don't use these on rez they are still present after an unlink, after which selecting them causes various viewers to crash
Hopefully really does address http://opensimulator.org/mantis/view.php?id=5664
2011-09-02 22:28:27 +01:00
af7c6c5f39
stop passing FromUserInventoryItemID right down into the deserializer.
...
the code becomes simpler if this is set from the outside - only one place needs to do this.
2011-09-02 00:50:16 +01:00
9c0a03731d
Move more of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:41:21 +01:00
15ea82e925
move more of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:25:05 +01:00
01146bb3e3
factor out a section of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:04:22 +01:00
3e86064d6b
refactor: factor out DoPostRezWhenFromItem() from IAM.RezObject()
2011-09-01 23:49:38 +01:00
cc8897127b
remove the pointless m_Scene.GetNewRezLocation() call at the top of IAM.RezObject() since its always recalculated later on anyway
2011-09-01 23:37:03 +01:00
712d44635a
refactor: Move sanity checks to the top of IAM.RezObject() to make the code more readable
2011-09-01 23:14:50 +01:00
e30651b931
use group.RootPart in IAM.RezObject() rather than group.GetChildPart(group.UUID);
2011-09-01 23:09:14 +01:00
8b83c4a433
Remove pointless NRE check in IAM.RezObject() since this can never occur
2011-09-01 23:06:57 +01:00
1bf29d60e1
Remove code which was automatically deleting non-root prims from scene objects that had previous been attachments.
...
Looks like this code was accidentally uncommented in e1b5c612http://opensimulator.org/mantis/view.php?id=5664
2011-09-01 22:05:05 +01:00
616e672fce
If the user receiving an inventory folder has left the scene by the time the acceptence message arrives, then don't send them an inventory update.
...
Doing so causes a NullReferenceException
2011-09-01 02:43:17 +01:00
c491cdcb95
refactor: use SOG register target waypoints and rots directly instead of calling through the SOP, which doesn't make conceptual sense anyway.
2011-09-01 02:18:31 +01:00
7eca929686
Eliminate pointless checks of SOG.RootPart != null
...
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
2011-09-01 02:11:00 +01:00
10d883dc88
refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID()
2011-09-01 01:41:53 +01:00
63bf710237
Fix issue with llGetTorque() where it would only ever return a zero vector.
2011-09-01 01:37:35 +01:00
095b3e5756
Remove pointless cluttering SOP.ParentGroup != null checks.
...
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
2011-09-01 01:22:28 +01:00
083ba72b28
Fix a bug where the non-root parts of rezzed objects that had previously been attachments were sending their old attachment values to the client.
...
The root part state is the canonical value, so always send that instead.
Sending conflicting attachments states for non-root parts of a rezzed object is enough to crash the client.
Fixes http://opensimulator.org/mantis/view.php?id=5664 .
Many thanks to mewtwo0641 for some fantastic qa work on this one.
2011-08-31 23:33:01 +01:00
ca9a054bba
Don't set a GridUser entry for NPCs.
...
Resolves http://opensimulator.org/mantis/view.php?id=5665
2011-08-31 18:03:07 +01:00
7d58b5fa15
move common code into AttachmentsModule.DeleteAttachmentsFromScene()
2011-08-31 17:53:58 +01:00
3aa86d22d1
If a FireAndForget thread terminates with an exception, then catch and log rather than letting it terminate the simulator.
...
Exceptions don't appear to do this with the SmartThreadPool but they do with UnsafeQueueUserWorkItem (and maybe others)
2011-08-31 17:38:32 +01:00
e69f246b86
refactor: move multiple class to set avatar height into associated SP.AddToPhysicalScene()
2011-08-31 17:25:18 +01:00
899d109e82
get rid of appearance null checks - this is never null
2011-08-31 17:13:53 +01:00
8c703022c1
In WorldCommModule, replace the useless Attachments == null check with Attachments.Count == 0 instead
2011-08-31 16:50:18 +01:00
d3c03658aa
minor: remove mono compiler warning
2011-08-31 16:48:21 +01:00
54839d28ad
remove pointless m_attachments == null check since this field is never null
2011-08-31 16:46:43 +01:00
5a5206449f
minor: seal up another instance of using the appearance list without locking
2011-08-31 16:41:58 +01:00
32444d98cb
Make SP.Attachments available as sp.GetAttachments() instead.
...
The approach here, as in other parts of OpenSim, is to return a copy of the list rather than the attachments list itself
This prevents callers from forgetting to lock the list when they read it, as was happening in various parts of the codebase.
It also improves liveness.
This might improve attachment anomolies when performing region crossings.
2011-08-31 16:29:51 +01:00
2acfff9f6d
remove pointless ToArray() call in AttachmentsModule.SaveChangedAttachments()
2011-08-30 23:39:26 +01:00
1809aaf74c
minor: remove already processed avatar null check in Scene.RemoveClient()
...
remove some now duplicated method doc
2011-08-30 23:36:45 +01:00
ddc733cd3d
refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule
2011-08-30 23:32:30 +01:00
04bafd2122
refactor: Move ScenePresence.RezAttachments() into AttachmentsModule
...
This adds an incomplete IScenePresence to match ISceneEntity
2011-08-30 23:06:10 +01:00
a90e1cf3aa
add Name property to ISceneEntity
2011-08-30 22:39:16 +01:00
1de68b34d9
refactor: migrate DropObject handling fully into AttachmentsModule from Scene
2011-08-30 22:25:38 +01:00
37a5cf5783
minor: comment out friends number logging from login for now
2011-08-30 22:08:43 +01:00
e7a515bab0
Fix bug where attachments were remaining on the avatar after being dropped.
...
If the inventory service is configured not to allow deletion then these will not disappear from inventory
2011-08-30 22:06:24 +01:00
17dab7245f
Merge branch 'master' into bulletsim
2011-08-30 08:44:28 -07:00
be357f8fee
Fix bug in persisting saved appearances for npcs
...
Assets have to be marked non-local as well as non-temporary to persist. This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
2011-08-30 01:58:32 +01:00
96dce3e16c
Use GetMeshKey from PrimitiveBaseShape.
2011-08-29 10:10:48 -07:00
648866b597
Merge branch 'master' into bulletsim
2011-08-29 09:55:34 -07:00
18037d41c4
Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:50:54 -04:00
80a2b81d52
Add level of detail specification to optionally reduce the number of vertices in generated prim meshes
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:49:25 -04:00
795b56e695
Related to #4689 - Adding missing null check for SceneObjectPart
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-27 07:45:02 -04:00
d4d894c20f
Stop avatars returning from neighbouring regions from stalling on the border crossing.
...
On making a root agent, we need to reset the ScenePresence.m_movement_flag so that it doesn't remember the
movement registered to the client when it exited the initial region.
If this is remember, then the client avatar movement isn't updated and it appears to stall in mid-air, though this is resolved with a prod/release of any other direction key.
This bug was probably introduced a few weeks ago. Surprised that nobody brought it up.
2011-08-27 01:28:33 +01:00
1615e7d29f
Eliminate duplicate AttachmentPoint properties by always using the one stored in the root part's state field.
2011-08-27 00:33:24 +01:00
b7700428ec
refactor: camel case AttachmentPoint method arg as per code standards
2011-08-27 00:20:15 +01:00
33a894f3d2
refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid pointless duplication of identical values
2011-08-27 00:15:21 +01:00
21708b832b
BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.
2011-08-26 15:51:21 -07:00
23f10f1d22
Merge branch 'master' into bulletsim
2011-08-26 15:23:46 -07:00
15a514fcbc
refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar
...
This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP
2011-08-26 23:06:41 +01:00
5f3ffc195f
refactor: move SOG.DetachToGround() to AttachmentsModule.DetachSceneObjectToGround() and remove redundant code
2011-08-26 22:49:11 +01:00
ae614c1264
refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene object group direct
2011-08-26 22:37:53 +01:00
040ad11e61
refactor: remove common presence set up in attachments tests
2011-08-26 22:24:51 +01:00
dc61bf4b1f
comment out verbose test logging from last commit
2011-08-26 22:17:27 +01:00
1dba047e4d
add regression test for detaching an attachment to the scene
2011-08-26 22:17:05 +01:00
002313bf13
refactor: move sog.DetachToInventoryPrep() into AttachmentsModule.DetachSingleAttachmentToInv()
2011-08-26 22:02:23 +01:00
fcbed6479a
Downgrade warning about not saving unchanged attachment to debug instead, and change text to better indicate what it's saying
2011-08-26 21:46:12 +01:00
6c692d2e21
Fix a very recent regression from llAttachToAvatar() fix where I accidentally stopped normal script state persistence on login/logout and attach/detach
2011-08-26 21:26:29 +01:00
04d42860fe
Merge branch 'master' of /home/opensim/src/opensim
2011-08-25 07:01:57 -04:00
cf42fcd978
llSetPrimitiveParams correct prim hollow for cases where limit should be 70%.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-25 06:50:55 -04:00
4b4c5e69e5
Remove forcing of phantom on ground attached objects - attachments can be both non-phantom and flagged as physical.
...
As per Melanie
2011-08-24 22:45:51 +01:00
d5dc8133fc
remove pointless IsDeleted check on SP.RezAttachments()
...
IsDeleted is never set for an SP, even though it's on EntityBase.
It might be an idea to set it in the future
2011-08-24 22:37:08 +01:00
6d4432f440
refactor: simplify EntityBase.IsDeleted property
2011-08-24 22:34:26 +01:00
21f1b68fdf
extend initial rez regression test to check that attachment is phantom
2011-08-24 22:25:23 +01:00
73d913dad2
Make objects attached from the ground phantom
2011-08-24 22:12:51 +01:00
9ba4511d3e
add SOG helper properties IsPhantom, IsTemporary, etc. to improve code readability
...
use these in some sog methods
2011-08-24 21:53:12 +01:00
801b7f18a7
return InventoryItemBase from AddSceneObjectAsAttachment()
2011-08-24 21:40:36 +01:00
5eeee480d4
refactor: move Scene.Inventory.attachObjectAssetStore() into AttachmentsModule.AddSceneObjectAsAttachment()
2011-08-24 21:35:44 +01:00
274e354006
get rid of pointless grp null check in attachObjectAssetStore()
2011-08-24 21:23:10 +01:00
0e0d40c810
minor: remove hardcoded region numbers with the region size constant and a currently hardcoded offset
2011-08-24 21:18:11 +01:00
ccf07f6ae3
refactor: remove pointless AgentId argument from attachObjectAssetStore()
2011-08-24 21:14:57 +01:00
b9ec625dbf
add TestAddAttachmentFromGround() regression test
2011-08-24 21:07:46 +01:00
cf3ffe5bb4
Fix llAttachToAvatar()
...
Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay.
So we now don't do this. The state will be serialized anyway when the avatar normally logs out.
The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state.
2011-08-24 20:49:23 +01:00
97b207240e
rename AttachmentsModule.ShowDetachInUserInventory() to DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour
2011-08-23 22:05:22 +01:00
014cd4f8bb
remove mono compiler warnings
2011-08-23 21:41:16 +01:00
805ba268d5
replace TestRemoveAttachments() with a more thorough TestRemoveAttachment()
2011-08-23 21:37:36 +01:00
4a101080ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-08-23 21:21:02 +01:00
34aed96a2f
replace old TestAddAttachments() with a more thorough TestAddAttachment()
2011-08-23 21:20:23 +01:00
ce011d7e44
Protect a check for default texture entry when setting alpha values. Apparently
...
if all faces have their own textures then the default texture is null
2011-08-23 10:52:12 -07:00
afd5469eec
Remove pointless contains check in ScenePresence.RemoveAttachment()
2011-08-23 00:08:29 +01:00
1f3ce48be1
If an object failed to attach due to an exception, then try and detach it from the avatar's list of attachments as well as delete it from the scene.
...
This may help with the "Inconsistent attachment state" errors seen on teleport.
See http://opensimulator.org/mantis/view.php?id=5644 and linked reports
2011-08-23 00:04:38 +01:00
d328046efb
If an attachment fails, then start logging the exception for now, in order to help with the inconsistent state bug.
...
This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods. However, more of this is required.
2011-08-22 23:59:48 +01:00
2eaadf2dc0
Add warning log message to say which attachment fails validation in order to pin down problems with "Inconsistent Attachment State"
2011-08-22 23:28:37 +01:00
138a5e04b8
minor: remove mono compiler warning
2011-08-22 23:10:43 +01:00
940a248c3d
minor: comment out simulator features log line
2011-08-22 22:44:49 +01:00
7cf4bb5256
Add ISimulatorFeaturesModule so that other modules can register features in addition to the hardcoded ones.
2011-08-22 22:13:07 +01:00
db91044593
Thanks Neil Canham for fixing bulk inventory updates, no sending BulkInventoryUpdate after accepting inventory items.
2011-08-22 14:51:43 +02:00
d74686fd51
read m_rpcHandlersKeepAlive under appropriate lock
2011-08-22 02:25:58 +01:00
c587b0a3a3
oops, fix build break from last commit
2011-08-22 02:10:45 +01:00
9469c62098
improve locking of m_agentHandlers in BaseHttpServer
2011-08-22 02:07:51 +01:00
f9a367e2f6
improve locking of m_HTTPHandlers in BaseHttpServer
2011-08-22 01:59:40 +01:00
5a11cffd23
improve locking of m_streamHandlers in BaseHttpServer
2011-08-22 01:58:50 +01:00
20a4367827
remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSDHandler()
2011-08-22 01:58:19 +01:00
8254116dc6
improve locking of m_llsdHandlers in BaseHttpServer
2011-08-22 01:52:08 +01:00
2f1ac1d144
minor: remove mono compiler warning
2011-08-22 01:45:46 +01:00
94a8ab80c8
improve locking of m_rpcHandlers in BaseHttpServer
2011-08-22 01:43:34 +01:00
5e231acdce
Add avatar and attachments to llRegionSay
...
llRegionSay will now message avatars on chan 0
and will message attachments on the avatar that
listen on channels other than 0.
This behavior is consistant with the LL
implementation as tested on regions in Agni
with one exception: this implementation does
not include issue:
https://jira.secondlife.com/browse/SCR-66 ?
2011-08-20 12:36:35 -04:00
2787207aa2
Add llRegionSayTo
...
llRegionSayTo(key target, integer channel, string messasge)
Allows messages to be sent region-wide
to a particular prim.
2011-08-19 18:47:21 -04:00
384cb79a1a
Merge branch 'master' into bulletsim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
bb5b396fc5
Fix exception when using BasicPhysics
2011-08-19 00:53:57 +01:00
c9e6b7bd10
Stop NPC's getting hypergrid like names in some circumstances.
...
This meant punching in another AddUser() method in IUserManagement to do a direct name to UUID associated without the account check (since NPCs don't have accounts).
May address http://opensimulator.org/mantis/view.php?id=5645
2011-08-19 00:45:22 +01:00
3146f4bae0
Don't need to try both AssetService.Get and GetCached in GetMesh since Get always calls GetCached and code paths were identical
2011-08-18 23:36:43 +01:00
fef73a1a10
BulletSim: add runtime setting of physics parameters. Update default values.
2011-08-18 14:32:09 -07:00
49258350e8
refactor: fold CreateSceneViewer() back into ScenePresence constructor
2011-08-18 01:22:01 +01:00
8d29d490a1
minor: remove some mono compiler warnings
2011-08-18 01:16:58 +01:00
45c37ef494
refactor: Fold 3 ScenePresence() constructors into one since only one is called.
2011-08-18 01:11:23 +01:00
c1a34cd8da
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
...
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
2011-08-18 00:53:05 +01:00
d8f886ccdb
comment out noisy attachments logging
2011-08-17 23:41:20 +01:00
eb8b6b7d52
minor: remove mono compiler warning
2011-08-17 23:28:57 +01:00
6b51d8a10e
In the asset service, check that an asset exists before attempting to store it.
2011-08-17 23:24:41 +01:00
4a9b8184f7
For now, supress 'OH NOES' warnings given by HGInventoryBroker.CacheInventoryServiceURL when it tries to cache it for an NPC
...
This concept is meaningless for NPCs. However, it might be better to make NPCism an actual property on ScenePresence and check.
Addresses http://opensimulator.org/mantis/view.php?id=5643
2011-08-17 01:51:58 +01:00
acfdca34fd
Fix issue where loading a new appearance onto an NPC would not remove the previous attachments from the scene.
...
Addresses http://opensimulator.org/mantis/view.php?id=5636
2011-08-17 01:35:33 +01:00
bd5d35ee32
extend test to check that there is one attachment and that it has the right name
2011-08-17 00:42:58 +01:00
696bd44833
Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple attachments check
2011-08-17 00:37:33 +01:00
d73c424078
get rid of logged warnings about lack of some modules - afaik these never occur in real life and just clutter up tests
2011-08-16 23:12:58 +01:00
57e54d84d6
Add new FireAndForgetMethod.None.
...
This executes the callback on the same thread that made the request. Designed for use only by regression tests that rely on a predicable event ordering.
2011-08-16 23:05:08 +01:00
d3c10e609e
Move some previously common code back into separate tests. Remove unused region handle from test.
2011-08-16 22:27:52 +01:00
0bbf7c21d7
Isolate existing incomplete attachments tests rather than have them rely on each other.
...
Much easier to debug this way.
2011-08-16 22:13:32 +01:00
c58b32e7ba
drop number of attachments in test from 3 to 2 to reduce text complexity
2011-08-16 22:09:13 +01:00
601257f8b6
remove setting up of second scene in attachments since it's not currently used
2011-08-16 21:58:52 +01:00
66eb537d0c
relocate AttachmentTests.cs to AttachmentsModuleTests.cs
2011-08-16 21:56:56 +01:00
8d866ae8c3
minor: remove some mono compiler warnings
2011-08-16 21:45:01 +01:00
fd3a7ab70c
minor: change some comment text in flotsam asset cache
2011-08-16 21:31:17 +01:00
8c95c83562
On Flotsam asset cache, go back to moving the file from the temporary location rather than copying.
...
Copying doesn't prevent IOExceptions on Windows due to file locking. (e.g. Mantis 5642, 5630).
So instead go back to moving the file, swallowing IOExceptions that occur just for the move due to competing caching threads or even different opensimulator instances.
2011-08-16 21:03:43 +01:00
0784791a44
Add "shutdown" message to RegionReady
...
Add "shutdown" message when removing region.
From a patch submitted by Michelle Argus.
Thanks Michelle
2011-08-15 16:21:04 -04:00
e8f09cd5f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-08-15 13:04:02 -04:00
e870442e31
Remove un-needed ATTACH command in migration script.
...
This was causing issues when using specified
paths to database files by using a hard-coded
name.
2011-08-15 12:59:17 -04:00
9a6ad1535e
Added console command "delete object outside" to delete all objects outside region boundaries. This is especiyll useful in cases where physical objects outside regions boundaries cause much physics engine lag.
2011-08-15 17:46:51 +02:00
70ea625447
Added optional Login Service parameter "Currency" to be able to change the currency name shown in the viewer.
2011-08-14 18:20:20 +02:00
e19843a0ee
WorldMap: Added map item for Land-for-Sale. Implemented backlist item timeouts (default 10 minutes; see also new config file setting BlacklistTimeout) and removing backlisted neigboring regions that have been restarted from the blacklist.
2011-08-14 17:45:23 +02:00
b80dfb6572
llGetPrimitiveParams fix prim hollow/hole shape value
2011-08-13 15:34:08 +01:00
dcb4b2de09
Fix a problem in the Flotsam asset cache where assets were being put into the memory cache even when it wasn't enabled.
...
This hopefully addresses http://opensimulator.org/mantis/view.php?id=5634
This is the most probable cause of the memory problems that people have been seeing in the past month.
This bug has been around since commit 5dc785b
2011-08-13 15:21:03 +01:00
90c6fa89be
Fix a bug preventing region modules from creating trees at anything but the default scale.
2011-08-13 00:52:32 +01:00
78ff82bfe9
If a map request to a server fails, always close the outbound connection.
...
This probably doesn't help with the current memory leak.
2011-08-12 23:40:22 +01:00
ed142ead25
minor: change login enable/disable messages in last commit so that they occur after the setting has been made
2011-08-12 22:50:58 +01:00
4b88f04c0a
minor: On "login disable/enable" always tell the user the final login status, rather than remaining silent if it was already on/off
2011-08-12 22:46:42 +01:00
76e0afe83f
tidy up some OSSL NPC parameter names
2011-08-12 02:46:44 +01:00
16ac5413dd
rename position parameter in osNpcMoveToTarget to target
2011-08-12 01:52:12 +01:00
aebd46a434
rename osNpcStopMoveTo() to osNpcStopMoveToTarget()
2011-08-12 01:32:49 +01:00
2169cf04f9
When saving appearance, only save the baked textures, not the other face textures (which are already stored permanently)
2011-08-12 01:24:15 +01:00
65c4b8d37b
Fix kicking of NPCs via "kick user" console command.
...
Needed to hook up the Close() function in the NPCAvatar IClientAPI implementation, which [unfortunately] is still needed
2011-08-12 00:51:05 +01:00
0a1bbc27d2
Allow the osNpcCreate() function to accept a notecard name or asset for initial appearance
2011-08-12 00:14:06 +01:00
d23d37d2aa
implement osNpcGetPos()
2011-08-11 23:36:22 +01:00
a21e98ae1a
implement osNpcGetRot() and osNpcSetRot()
...
Rotation works if done around the z axis. Anything else leads to random results.
2011-08-11 23:28:14 +01:00
b1ae930c6b
Implement osAgentSaveAppearance() to save the appearance of an avatar in the region to a notecard
...
This is separate from osOwnerSaveAppearance() so that owner saves can be allowed without allowing arbitrary avatar saves
2011-08-11 22:26:47 +01:00
50945dd560
add regression test for osNpcCreate when cloning an in-region avatar
2011-08-11 21:43:26 +01:00
83ca5a101d
Split out to-be-common setup stuff from TestOsOwnerSaveAppearance()
2011-08-11 20:56:18 +01:00
b3a4b10531
eliminate redundant ground sitting checks since these are already done in enclosing control structures
2011-08-11 03:16:46 +01:00
3d4cc93a8e
minor: a little bit of log message correction/commenting out
2011-08-11 03:07:41 +01:00
1aa1711893
eliminate the rotation parameter from SP.HandleMoveToTargetUpdate(). This can just use the currently set Rotation
...
looks like I spoke to soon about eliminating jerkiness on "go here"/autopilot. It's still there.
2011-08-11 03:06:38 +01:00
36f7d36fa1
instead of setting avatar rotation twice in SP.HandleAgentUpdate(), eliminate the second setting in AddNewMovement()
2011-08-11 02:54:15 +01:00
29093df1a7
get rid of intermediate local store of body rotation in ScenePresence, this is not used.
2011-08-11 02:36:02 +01:00
ee22569c92
only accept npc UUIDs to osNpc* functions, not names (except for create)
2011-08-11 02:19:13 +01:00
cace6eaa8a
comment out some of the currently less useful debug log messages
2011-08-11 02:06:32 +01:00
4402851b08
Get NPCs to revert to the correct 'resting' animation (e.g. stand or hover) after finishing their movement. This also fixes judder after an avatar has finished "go here"/autopilot movement in a viewer.
...
This meant reseting the SP.AgentControlFlags since the Animator uses these to determine the correct default animation.
2011-08-11 01:56:42 +01:00
951ffad81e
If SP.MoveToTarget has been called with a force walk, begin by landing the avatar.
...
There is a bug here - once an avatar has landed it glides to its new position instead of performing a walk animation
2011-08-11 00:23:54 +01:00
7f499ff3f3
Add a OS_NPC_LAND_AT_TARGET option to osMoveToTarget()
...
Default for this function is now not to automatically land.
This allows better control by scripts when an avatar is going to be landing on a prim rather than the ground.
Stopping the avatar involves faking a collision, to avoid the pid controller making it overshoot.
A better approach would be to gradually slow the avatar as we near the target
2011-08-10 23:56:19 +01:00
fb92678b83
fly and no fly constants for osNpcMoveToTarget()
2011-08-10 22:34:42 +01:00
5d6c9644fa
early code to allow scripts to force npcs not to fly when moving to target
...
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
2011-08-10 01:47:37 +01:00
4cb8d6379d
Stop trying to deregister caps or close child agents when an NPC is removed
2011-08-10 00:59:31 +01:00
195c1dc9b8
implement osNpcStopMoveTo() to cancel any current move target
2011-08-10 00:26:38 +01:00
cba54090c7
When an NPC appearance is loaded, rez the attachments too
2011-08-09 23:25:52 +01:00
92e96d394a
When an NPC is created, stop telling neighbouring regions to expect a child agent
2011-08-09 23:11:07 +01:00
795c8e6c22
Add osOwnerSaveAppearance() to help with setting up NPC appearances. Not yet ready for user use.
...
Adds regression test.
2011-08-09 22:05:47 +01:00
e869eeb0bf
Implement first draft functions for saving and loading NPC appearance from storage.
...
This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent.
By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type.
Notecards also allow different appearances to be swapped and manipulated easily.
This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text.
This works in my basic test but is not at all ready for user use or bug reporting yet.
2011-08-09 03:51:34 +01:00
3e16a0fbdd
factor out common notecard caching code from 3 methods.
2011-08-09 00:12:41 +01:00
78d8ce3816
refactor: split out generic parts of osMakeNotecard() into a separate. Add method doc. Other minor tidies.
2011-08-08 23:22:47 +01:00
6878049952
get rid of bogus log message
2011-08-06 03:06:05 +01:00
eec54adac5
remove some obsolete tests that are now done elsewhere
2011-08-06 02:38:38 +01:00
e37f8cf902
Add a test to check that ScenePresence and circuit go away when a root agent is closed down
2011-08-06 02:27:25 +01:00
85e07c78fb
refactor: Change SceneHelpers.AddClient() to AddScenePresence().
...
This seems to make more sense as we can get SP.ControllingClient
2011-08-06 02:17:41 +01:00
83ba35a26b
rip out sog generation methods in ScenePresenceAgentTests and use SceneHelpers instead
...
Not that it matters, since these tests are pretty bogus anyway.
Also, renames some test classes for consistency.
2011-08-06 02:01:25 +01:00
2b26d2f1a5
prevent "create region" console command from being able to create a region with the same id as one that already exists.
...
Addresses http://opensimulator.org/mantis/view.php?id=5617
2011-08-06 01:35:01 +01:00
76f46b2545
Do proper locking of m_localScenes list in SceneManager
2011-08-06 01:15:49 +01:00
dad1d6df18
rename TestHelper => TestHelpers for consistency
2011-08-06 00:31:03 +01:00
bda1a4be45
rename test SceneSetupHelpers -> SceneHelpers for consistency
2011-08-06 00:26:37 +01:00
cba40de109
extend phantom flag regression test to toggle back off
2011-08-06 00:22:14 +01:00
c6c91e6599
refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify.
2011-08-06 00:13:08 +01:00
ba89fc3aa1
Add regression test for setting phantom status on a scene object. This is not yet complete.
2011-08-05 23:42:05 +01:00
f18780d0e3
Get "show region" command in GridService to show grid co-ordinates rather than meters co-ord.
...
This makes it consistent with "show regions"
Addresses http://opensimulator.org/mantis/view.php?id=5619
2011-08-05 22:56:53 +01:00
82f41fdcb5
BulletSim: fix problem with not convex hulling large objects by creating unit meshes and always scaling in Bullet
2011-08-05 14:53:39 -07:00
7d35bf8193
refactor: remove a sliver of unnecessary code
2011-08-05 22:45:42 +01:00
1a2518d19b
Instead of moving the file to its final place when FlotsamCache writes to disk, copy it instead.
...
This is to eliminate IOException where two threads compete to cache the same file.
2011-08-05 19:57:47 +01:00
c3f579046c
Merge branch 'master' into bulletsim
2011-08-05 11:13:02 -07:00
7640b5abf6
BulletSim: Parameters settable from ini file. Linksets. Physical property value tuning
2011-08-05 11:01:27 -07:00
94d496cf2b
remove the largely unused copy/pasted HandleAgentRequestSit() method
2011-08-05 00:57:43 +01:00
1918402cb1
if an NPC target is set to a ground location, then automatically land them when they get there.
...
This doesn't help where the target is a prim surface. In these situations, it might be better to provide manual overrides so the script can control whethre an avatar flys there/lands, etc.
2011-08-04 03:08:35 +01:00
54ce029342
if an NPC move to target is above the terrain then make it fly to destination
2011-08-04 02:31:40 +01:00
f999acd095
minor: remove some mono compiler warnings
2011-08-04 01:46:34 +01:00
c678b75d65
if a move to target is set underground, constrain it to the terrain height
2011-08-04 01:45:56 +01:00
61a931490d
move bAllowUpdateMoveToPosition switch outside of HandleMoveToTargetUpdate()
2011-08-04 01:30:37 +01:00
831f933ce6
only call move target code in SP.HandleAgentUpdate() if we're actually in the process of moving to a position
2011-08-04 01:22:01 +01:00
7b2b47530e
move reset code out of HandleMoveToTargetUpdate() so that we only call it where needed instead of passing in a flag
2011-08-04 01:16:24 +01:00
fc64cc2439
Make SIGNIFICANT_MOVEMENT SP constant a top-level property so that other classes can use it.
2011-08-04 01:05:43 +01:00
7f6f100c5a
When the NPC reaches within the SIGNIFICANT_CLIENT_MOVEMENT distance of the target, move it directly to the target.
...
This makes the movement exact. Regression test changed to check avatar reaches exact target.
Also has the nice side effect of making NPC animations continue to work after the first movement (which wasn't working). However, avatar still pauses in mid-stride
2011-08-04 01:00:33 +01:00
ba0c65e028
extend npc move test to check a second movement
2011-08-04 00:25:51 +01:00
6f913e8caf
eliminate pre-existing unused SP.StopMovement()
2011-08-04 00:13:27 +01:00
a2f5b4ac9a
Rename HandleMoveToPositionUpdate() to HandleMoveToTargetUpdate() for consistency. Improve method doc.
2011-08-04 00:10:53 +01:00
0299cb060e
eliminate a reset position flag by using functionally equivalent DCFlagKeyPressed
2011-08-04 00:06:01 +01:00
6ab01b338f
Stop calling the SP.ResetMoveToTarget() code if a target is not actually set
2011-08-03 23:59:13 +01:00
31fb6b2d72
remove move to duck walk compensation - no longer required.
...
extends npc move to regression test to check stop after sufficient sim updates
2011-08-03 23:40:05 +01:00
61d49d4f63
rename NPC.Autopilot to NPC.MoveToTarget internally. Add method doc to INPCModule
2011-08-03 23:20:36 +01:00
31cea17f8e
extend move test to check avatar is moving in the right direction after setting a move target
2011-08-03 23:13:52 +01:00
21d8a6b0e8
extend move test to check one beat of the simulator without actually asking the npc to move.
2011-08-03 23:06:18 +01:00
d78fe44191
Add passing but incomplete NPC move regression test
2011-08-03 22:51:46 +01:00
e0503d397c
stop avatar service being set up in NPC TestCreate() - it's no longer used
2011-08-03 22:45:43 +01:00
a333c60f28
refactor: rename the move to position methods to move to target to be consistent with terminology used by scene object part and elsewhere
2011-08-03 22:34:05 +01:00
2964467708
get rid of vestigal move to parameters
2011-08-03 22:11:05 +01:00
b7a3f36c65
enable the NPC module for its regression test
2011-08-03 04:48:47 +01:00
797def8aa4
Put config to enable disable [NPC] module.
...
Default is disabled. You will need to explicitly enable to toy with this.
2011-08-03 04:33:45 +01:00
6e4ec29722
Do a partial fix/implementation of OSSL osNpcMoveTo()
...
Avatar moves and stops. However, will stop in mid stride.
And if the move to position is in the air, avatar will continue to make vain and quite hilarious attempts to take off (but never doing so).
Clearly more work is needed.
2011-08-03 04:19:19 +01:00
68a5fe0431
Improve z axis move to/autopilot so the avatar does alternative crouch/huzzah when walking along the ground
...
Moving a flying avatar to a ground point doesn't yet land the avatar. This may or may not be the best thing
2011-08-03 02:59:49 +01:00
30e816bfa2
Implement move to/autopilot for z axis movement as well.
...
This is jerky (an artifact of the way it's being done, I think), but it's better than on implementation.
2011-08-03 02:04:38 +01:00
0c23764ce2
get autopilot/go here to work immediately.
...
This works with viewer 1.23.5 and so in theory should work with libopenmetaverse.
2011-08-03 01:12:32 +01:00
1c126e6e22
refactor: Move update_movement_flag and the final check inside the m_allowMovement if in HandleAgentUpdate() since it's logically only ever used there
2011-08-03 00:55:52 +01:00
f9689f5cc9
refactor: move out code from HandleAgentUpdate() which processes updates to move to a set position
...
Also comment out the really spammy log message I accidentally left in on the last commit.
2011-08-03 00:46:46 +01:00
74b23210a7
Fix Flotsam cache so it will use the disk cache if the memory cache is enabled
2011-08-02 23:44:40 +01:00
c122489e09
Partially fix autopilot/go here
...
This now works again except that it requires a click or avatar mvmt to get going
This is because the ScenePresence.HandleAgentUpdate() method doesn't trigger until the client does something significant, at which point autopilot takes over.
Even clicking is enough to trigger.
This will be improved presently.
2011-08-02 23:41:12 +01:00
b7f81d3492
If GetRegionByName can't match something in the local db, then search the hypergrid if that functionality has been enabled.
...
This should fix the problem today where old style HG addresses (e.g. "hg.osgrid.org:80:Vue-6400") stopped working since 8c3eb324c4
2011-08-02 01:06:32 +01:00
d2220da205
remove ancient late 2008 cruft that handles the situation where the GetRegionsByName used to not be implemented/returned null.
...
It's impossible that anybody is still running this since the infrastructure has changed massively since that time.
2011-08-02 00:58:08 +01:00
17e9d61f43
Change GridService.GetRegionByName() to only return info if there is an exact region name match, unlike GetRegionsByName()
...
This should fix the first part of http://opensimulator.org/mantis/view.php?id=5606 , and maybe 5605.
Thanks to Melanie for helping with this.
2011-08-02 00:52:48 +01:00
e6fb9d74ef
Revert "In GridService, have GetRegionByName() call GetRegionsByName() with a max return of 1 instead of duplicating code."
...
This reverts commit 8d33a2eaa1
2011-08-02 00:40:23 +01:00
8d33a2eaa1
In GridService, have GetRegionByName() call GetRegionsByName() with a max return of 1 instead of duplicating code.
...
This also fixes the problem where this method would not return a hypergrid region, unlike GetRegionsByName()
2011-08-02 00:26:17 +01:00
b6ac1c46cd
Get rid of AvatarAppearance.Owner to simplify the code.
...
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
2011-08-02 00:13:04 +01:00
59f548cda8
Get osNpcCreate appearance working with avatars that are currently in the scene.
...
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing).
Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing.
Extended TestCreate() to check this.
2011-08-01 23:41:29 +01:00
05e94ff27e
Move common gemo/agent map name code into CreateGeom()
...
Fix build break.
2011-08-01 07:04:13 +01:00
f9d6a91252
Instead of preserving old name in geom_name_map in change size or shape, use the Name property instead.
...
This is equivalent since the prim 'name' is never changed. In fact, this propery is never used for prims
2011-08-01 06:52:52 +01:00
40a78db182
comment out unused code in OdeScene.TriCallback()
2011-08-01 06:47:45 +01:00
ccb4b76242
On geom removal, remove the name from the OdeScene.geom_name_map too
2011-08-01 06:40:29 +01:00
f79df6f43f
remove the unused ODEPrim.prev_geom field
2011-08-01 06:35:59 +01:00
f32dbef647
When an ODE geom is removed (as when a non-phantom prim is deleted, resized or shape changed, also remove the OdeScene.actor_name_map entry pointing to the phys actor
...
This is to stop a small memory leak over time when prims are deleted or phantom-toggled
2011-08-01 06:32:30 +01:00
6618948ff9
refactor: centralize prim geom removal code from four places to one
2011-08-01 06:15:02 +01:00
509200d5cd
minor: add note to RemovePrimThreadLocked() to the effect that it contrary to the summary, it is being called from within Simulate() lock (OdeLock)
2011-08-01 05:48:27 +01:00
dfa2f7d715
If a prim changes size or shape, add actor to _parent_scene.actor_name_map with new prim_geom key, as the old one becomes invalid.
...
This resolves http://opensimulator.org/mantis/view.php?id=5603 where changing size or shape would stop collision_start being fired in a running script.
In both this and existing code we are not removing old actors from actor_name_map when the existing prim_geom is removed, which leads to a small memory leak over time.
This needs to be fixed.
2011-08-01 05:43:04 +01:00
2102964826
minor: indentation correction
2011-08-01 05:14:16 +01:00
b757583662
Comment out SOP logging message I accidentally left in
2011-07-31 03:41:35 +01:00
aea7007533
refactor: split out ninja joint part of SOP.DoPhysicsPropertyUpdate() so that we don't have to look at it if it's not relevant
2011-07-31 02:50:50 +01:00
450bdb3657
In the packetpool, if we encounter a data block that somehow wasn't retrieved via GetDataBlock() then create a new stack instead of throwing an exception
2011-07-31 02:30:40 +01:00
d041276517
Remove _mesh field since the mesh data no longer needs to be stored after it's initially used.
...
This may improve memory usage for regions using mesh and sculpts, though I suspect that it doesn't address the current memory leak.
2011-07-31 01:03:52 +01:00
bd8f538f80
refactor: Remove argument to pass in an initial mesh to OdePrim since this is no longer required and it prevents removal of the _mesh field (which is only used temporarily)
...
If passing in a mesh becomes important again in the future then this can be reinstated.
2011-07-31 00:49:49 +01:00
196a774b24
minor: correct method doc for last commit
2011-07-31 00:45:20 +01:00
454312f5bc
refactor: rename CreateGeom _mesh argument to mesh, so as to not confuse this with the pre-existing _mesh field
2011-07-31 00:44:23 +01:00
f1ce17071d
minor: method doc
2011-07-31 00:43:02 +01:00
e08be91c84
Refactor: Replace instances of m_isphysical with IsPhysical rather than have some code reference the private var and other the public var without any functionality difference.
...
Add some method doc to IsPhysical
2011-07-30 23:44:47 +01:00
4f4d080461
refactor: Rename ODEPrim.ParentPrim() to AddChildPrim() for code readability
2011-07-30 23:20:43 +01:00
49a3740ee9
minor: remove mono compiler warnings, some code spacing adjustments
2011-07-30 03:56:29 +01:00
9fc59e2bf2
minor: remove some mono compiler warnings
2011-07-30 03:19:00 +01:00
d917010433
minor: Add method doc to collision subscription methods. Change method case to reflect OpenSim standards.
2011-07-30 03:11:36 +01:00
310a685220
refactor: extract method that generates a physics mesh from prim shape data
2011-07-30 02:34:50 +01:00
4197f66052
refactor: extract code which generate points and faces from sculpt data into it's own method.
...
fix build break.
2011-07-30 02:22:05 +01:00
b0eacadeb4
fix bug in previous commit
2011-07-30 02:09:17 +01:00
122e01949d
refactor: move the code that generates physics meshs from prim mesh data into a separate method, in order to make the code more readable.
2011-07-30 02:08:32 +01:00
7791c1fd1e
Replace the generic exception logging in flotsam asset cache with more specific stuff to return more information.
2011-07-30 01:35:22 +01:00
c4c6b457c3
correct misleading "fcache status" text - deep scans are not performed when this command is invoked.
2011-07-30 01:16:10 +01:00
2f5995f5c0
Temporary code to change bad AvatarHeight values in the AvatarService to the default Ruth height.
...
I was persuaded to do this because simulators on osgrid will persist in inserting bad values for an unknown length of time, even after the original simulator bug which was inserting bad values is out in an osgrid distro
This code can be removed at some point in the future, though I think there is an argument for having services police these values in open grids.
2011-07-30 00:58:17 +01:00
6d866ba6d5
Temporarily put in a log line which shows which locale the user is running in.
2011-07-29 23:43:35 +01:00
9a5e0ede7c
For all Util.FireAndForget invocations, set thread to en_US before continuing wtih the invocation.
...
This is to avoid bugs where the locale is not manually set on the thread and bad data values get sent to the database or over the wire.
Lots of code does this manually but as we've seen, a subtle change can hit code which has forgotton to do this.
Since en_US show be used throughout the server at present, setting it at FireAndForget seems reasonable.
Arguably, it would be better to do this where data is sent, but doing it here is much easier.
All the manual BeginInvokes() remaining in the code should probably call FireAndForget instead.
2011-07-29 23:21:57 +01:00
84c68c61bd
When we start the appearance saving thread, make sure we set the culture to En_US so that a different culture doesn't save values with commas as decimal points, etc.
...
This will hopefully stop giants stalking the grid.
See http://opensimulator.org/mantis/view.php?id=5614
2011-07-29 22:27:04 +01:00
5043be13fb
Return null from CreateMeshFromPrimMesher if OpenJPEG decoding of the sculpt data fails.
...
This is to address http://opensimulator.org/mantis/view.php?id=5612
2011-07-29 21:49:23 +01:00
f3c5a5b745
fix extremely minor Ode bug where the _taintedPrimL list would always be cleared on every OdeScene.Simulate() even if it was already empty.
2011-07-29 01:18:42 +01:00
2a39d0cdb0
refactor: Move another chunk of ninja code out of the OdeScene.Simulate() loop for consistency and readability.
2011-07-29 00:51:07 +01:00
3f0d8f3cbf
refactor: Simplify reading OdeScene.Simulate() loop by shunting all the NINJA joints stuff into its own method.
...
Now if ninja joints isn't active (which is the default) don't have to wade through a lot of massively indented irrelevant code.
2011-07-29 00:39:02 +01:00
9c6227da66
refactor: unindent the OdeScene.Simulate() loop to ignore the long commented out ifs and locks
...
This is to make it more readable.
2011-07-29 00:23:42 +01:00
8c3eb324c4
When using osTeleportAgent() and osTeleportAvatar(), only teleport if the region name exactly matches (not near matches)
...
This is to prevent situations where the first name returned by GridService.GetRegionsByName is not one that exactly matches the given region name, even when there is an exact match later on in the list.
Only the above two functions call this teleport method (the map uses a different routine) so this seems safe to change.
Addresses http://opensimulator.org/mantis/view.php?id=5606
2011-07-29 00:00:35 +01:00
c4ffcd4b7d
Ensure that packet headers get parsed correctly
2011-07-27 09:12:00 +01:00
4cdc8806fb
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:40:38 +01:00
504de8bc47
Pass the first name and last name from the agent circuit data to the authorization service rather than from the account.
...
This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account.
See http://opensimulator.org/mantis/view.php?id=5517 , this code is somewhat adapted/cleaned up from Michelle's patch
I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure.
It's up to the auth service to decide which data it actually uses.
Possibly we should be passing through other info such as agent circuit ip
2011-07-23 03:48:53 +01:00
4eaca4884e
Fixed serverside_object_permission default value confliction
2011-07-23 02:26:13 +01:00
be9b4ad23a
For default everyone permissions on library items, make notecards and scripts non-modifiable (but still copyable, etc).
...
Users should not be given the impression that they can modify these items.
This still does not solve the issue where library items cannot be dragged into prims or user inventory any time after they are initially seen.
Curiously, manually copying and pasting still appears to work.
On the surface, this seems to have something to do with library item caching on the client, since deleting the cache allows drag to work again once
Not sure what the exact problem is.
2011-07-23 02:18:23 +01:00
f0895028e9
Remove manually permissions settings on all current library items so that they use the defaults instead.
...
Some items had completely wrong permissions - this is easier than correcting them all.
The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
2011-07-23 02:13:11 +01:00
fcaa4f6012
Revert "Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default)."
...
There actually are uses for this. I will correct the perms instead since some entries appear to be wrong.
This reverts commit 667b54f5a2
2011-07-23 02:05:51 +01:00
667b54f5a2
Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default).
...
Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
2011-07-23 01:59:14 +01:00
869883f2dc
BulletSim: fix buoyancy for prims. Start of configurable physics parameters.
2011-07-22 15:23:57 -07:00
aadc4eb3b8
Fix problem where sculpts were not getting physical proxies
...
Fixed this by inspecting Shape.SculptEntry at various places instead of Shape.SculptType. Sculpties actually have a SculptType of Cylinder - only true mesh is SculptType.Mesh
This addresses http://opensimulator.org/mantis/view.php?id=5595
2011-07-22 19:23:38 +01:00
5ffec1cd64
Pass collisions and updates in pinned memory (saves marshaling).
...
Fix folding feet by using collision normals.
Add constraint specification.
2011-07-22 10:23:40 -07:00
4cbc912375
Merge branch 'master' into bulletsim
2011-07-22 09:02:32 -07:00
6ac0bc7259
Thank you, Michelle Argus, for a patch that adds reading the agent limit
...
from XML properly.
2011-07-22 12:36:05 +01:00
02e54c57c4
Generate the initial maptile asynchronously
...
Signed-off-by: Melanie <melanie@t-data.com>
2011-07-22 09:52:21 +01:00
d8228f4374
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-07-21 21:12:50 +01:00
71ef4a8fb3
When an uncached asset is requested multiple times concurrently, only load it once
...
Signed-off-by: root <root@grid00001.t-data.com>
2011-07-21 20:52:56 +01:00
56830bfe07
When handling SetAppearance packet, always save the appearance; not only if the texture was changed
2011-07-21 20:18:36 +01:00
f97278610c
Fixed updating avatar appearance
...
Signed-off-by: root <root@grid00001.t-data.com>
2011-07-21 20:13:32 +01:00
2c11f7fc38
Merge branch 'master' into bulletsim
2011-07-20 15:01:32 -07:00
3270bd560e
Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts
2011-07-20 14:34:02 -07:00
9fc7d65df7
Apply the localID to the Physics actor to prevent null calls later
2011-07-19 18:26:36 +01:00
51c47677a1
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 18:17:19 +01:00
ee829a71c2
On all undo/redo operations, consistently lock the undo object for everything, in order to avoid any deadlock issues.
2011-07-19 06:13:05 +01:00
c50533659a
If we store an undo, wipe anything already present on the redo stack
...
This stops problems when we undo a few steps and start off down another path.
Surprisingly, apart from this now fixed problem, redo appears to be working too.
2011-07-19 06:11:16 +01:00
ec1ecd3633
stop redo throwing an exception if there is nothing to redo
2011-07-19 06:05:23 +01:00
25c532f2ec
refator: simplify UndoState.Compare() code
2011-07-19 05:58:52 +01:00
9dd5a24495
rip out pointless null checks in UndoState where part can never be null
2011-07-19 05:51:19 +01:00
bc3679b67d
Fix undo when changing just the root prim's position in a linkset.
...
I think (ha ha) this largely fixes undo, except for the fact that rotation a set of prims with 'edit linked parts' selected doesn't quite work properly (though this works fine if the checkbox isn't selected).
Also, the double undo bug for resize is still present.
Redo might be incredibly buggy, haven't even looked at that yet.
2011-07-19 05:46:17 +01:00
0ef29da9b2
refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consistency
2011-07-19 05:20:04 +01:00
62325829ec
comment out all kinds of debugging guff
2011-07-19 05:14:58 +01:00
1fdb16f1cd
Fix undo for rotation of the root prim in a linkset on its own.
...
The only obviously broken things right now are the undo of the position of just a root prim (stays in place) and the fact that resizes need two undoes.
2011-07-19 05:05:50 +01:00
b2722e984a
Fix undo of rotation of single prims in a linkset
2011-07-19 04:40:02 +01:00
97f1edfd95
Fix undo of prim group rotation.
...
This isn't that great since I think I broke it a few commits earlier.
Undo of rotation of individual prims in a linkset is still broken
2011-07-19 04:15:27 +01:00
4b9ef4f39c
Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what it actually does and is more consistent with other method names.
2011-07-19 03:44:49 +01:00
7c468cda36
Stop undo of just the root prim position in the linkset from shifting the whole linkset.
...
However, what happens now is that undo just doesn't do anything when the root prim is selected on its own. This requires more code than just fiddling with undo states.
2011-07-19 03:38:22 +01:00
c94dc95844
fix undo when resizing of non-root individual prims in a linkset
...
undo resize, rotation and position still needs fixing when only editing root prim of a linkset
2011-07-19 03:27:16 +01:00
430a4aeba8
Fix undo for resizing linksets
...
This involves implementing a boolean in UndoState to signal whether the undo needs to be done for an entire group/linkset or just a single prim
Resizing individual components of linksets is still dodgy.
Resizing still has to be down twice, since for some reason the client is sending two multiobjectupdate packets on every resize except the very first. This applies to single prims and linksets. Need to look into this.
2011-07-19 03:01:54 +01:00
86f45f6fe7
remove undo state storage in a few places where it's pointless
...
no functional effect - existing bugs still remain
2011-07-19 01:24:43 +01:00
6fc74b36d1
Make various tweaks to undo code in an effort to get things working better.
...
Undo rotation and position appear to be working.
Resizing a single prim appears to be working, though the undo has to be done twice.
Resizing a group of prims still does not work properly - possibly because in the UndoState we don't store a knowledge of when we're resizing a whole group rather than individual prims.
This needs to be addressed.
2011-07-18 04:54:21 +01:00
aec3b58a57
use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.
...
remove OpenSim.Framework.UndoStack
2011-07-18 02:06:06 +01:00
3f8e571b78
Use a standard generic system stack for the undo/redo stacks instead of our own homebrew.
...
system stack also uses an array, so no performance penalty.
Also exposes undo count and adds a test assertion for correct undo count after resize
2011-07-18 02:01:12 +01:00
bdd340b9fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-07-18 01:35:00 +01:00
e9a739f45f
refactor: group all the undo/redo code in SOP into one place for easier code reading
2011-07-18 01:33:57 +01:00
dd2564d7ec
refactor: Pull up Assembly of the SQLite classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff10 for MySQL -- no functional changes.
2011-07-16 09:49:38 +02:00
f5ddf37112
Replace ifs in SOG.GroupResize() with Math.Min()
...
Also fiddle a bit with undo. This is not currently working properly, though to be fair it also didn't appear to work in 0.7.1.1 either (at least for resize).
Will get some more attention soon.
2011-07-16 05:23:21 +01:00
9a80adf33a
remove now unncessary parts of SceneObjectGroup.Resize()
2011-07-16 04:49:21 +01:00
122745fe1c
refactor: replace scale limiting code with more elegant Math.Min calls
2011-07-16 04:28:49 +01:00
2b68ac4ba3
refactor: Push all part resize code down into SceneObjectPart.Resize()
2011-07-16 04:22:57 +01:00
4b5a6b655b
add test for resizing one part in a group
2011-07-16 03:52:30 +01:00
df2a59d31b
refactor: make SceneObjectGroup.GroupScale() a property rather than a mehod
2011-07-16 03:30:14 +01:00
0f9882db5b
minor: add a log warning if a sculpt/mesh async asset request returns no data
2011-07-16 03:24:36 +01:00
6f9b855719
refactor: remove pointless sender != null tests, etc, in AssetReceived, since the method called always belongs to the object that generated the request
2011-07-16 03:16:24 +01:00
982e71b6b8
eliminate unused and redundant SceneObjectGroup.AssetReceived()
2011-07-16 03:08:28 +01:00
c82f19e41c
fix build break from last commit
2011-07-16 03:06:30 +01:00
3fc12e7224
Eliminate the pointless textured id argument to SculptTextureCallback
2011-07-16 03:02:28 +01:00
2b339b7d2b
minor: remove mono compiler warnings
2011-07-16 02:56:54 +01:00
27fae36a21
remove the need to supply SceneObjectGroup.GroupResize() with a localId.
...
This is utterly pointless scene we already know which sog we're dealing with.
2011-07-16 02:53:36 +01:00
50bd48542c
Add very basic test for resizing a scene object with one prim
2011-07-16 02:44:00 +01:00
6179879308
minor: remove mono compiler warnings
2011-07-16 01:53:25 +01:00
da7340b9fb
If resized shape is a mesh/sculpt, leave it to the mesh asset callback to trigger the physics actor taint.
...
In the last commit, the fix was made by updating all the child prim physics actors with the new size rather than just the root part.
2011-07-16 01:42:56 +01:00
18652eb87e
Fix physics proxy regeneration when a mesh with more than one submesh is resized
...
Addresses http://opensimulator.org/mantis/view.php?id=5584
2011-07-16 01:36:27 +01:00
7247ca1644
use constants in llGetObjectDetails() rather than magic numbers
2011-07-16 00:08:11 +01:00
a9ba9d4a9e
change async parameter name in AddLocalPacketHandler since it becomes a reserved keyword in .net 5
...
Also adds some method doc.
2011-07-15 23:51:55 +01:00
0ee7a5ee81
If object is an attachment, make llGetVel() return the avatar's speed rather than the object's own zero speed.
...
As per http://opensimulator.org/mantis/view.php?id=5575
2011-07-15 23:36:32 +01:00
3e5b2d52ff
minor: method doc for baked texture uploading
2011-07-15 22:58:29 +01:00
e9dbe54ab1
Fix some local id issues in physics glue
2011-07-15 20:07:59 +01:00
b55076990c
fix duplication of physical objects for physics engines that care about the initial value of localID
2011-07-15 11:37:34 -07:00
c7e8529122
minor: remove whitespace
2011-07-13 01:25:17 +01:00
0d64155bb5
Remove an unused 404 checker since on a 404, GetResponse() throws a WebException rather than proceeding.
2011-07-13 01:24:22 +01:00
938b4f8bf8
if a SynchronousRestObjectRequester request fails, then unless it's due to a 404, log the exception for diagnostic purposes
...
This is instead of logging "Invalid XML" for all failures, even if they weren't a result of invalid xml.
A default TReponse is returned in the event of a 404, which is the same behaviour as previously.
2011-07-13 01:19:12 +01:00
e434ba5e8e
Remove the obsoleted SynchronousRestObjectPoster
2011-07-13 00:52:32 +01:00
08dc07dc76
refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
2011-07-13 00:48:36 +01:00
5158ec0913
Add experimental module to check status of services that the simulator is connected to.
...
Currently disabled.
2011-07-13 00:24:55 +01:00
bf1b8397bb
Add a warning to URI config in GridCommon.ini.example not to add a slash to the end.
...
Tidy up GridCommon.ini.example
2011-07-12 23:35:06 +01:00
3e456163dd
Port implementation of llCastRay() from Aurora.
...
I haven't been able to test this since the viewer won't parse the llCastRay() function. Maybe some activation cap is missing. Could wait until it is activated by default in the viewer.
2011-07-12 22:13:15 +01:00
d31e0a67f7
temporarily fix the build break with building the OdePlugin tests assembly.
...
This needs to be fixed properly.
2011-07-12 03:26:22 +01:00
f75f906e35
minor: remove whitespace to trigger another build
2011-07-12 03:13:05 +01:00
df0e5cc9fe
When a mesh object is added to a scene, delay adding the physics actor until the sculpt data has been added to the shape (possibly via an async asset service request)
...
This prevents spurious 'no asset data' for meshes added on startup.
2011-07-12 02:33:09 +01:00
dbd954d701
Fix permissions problem where newly uploaded meshes rezzed from inventory could not be copied by owner.
2011-07-11 22:56:14 +01:00
b9cbe92f30
Merge branch 'master' into bulletsim
2011-07-11 12:23:20 -07:00
24efb021ff
minor Tack the prim name on the end of the "experimental mesh proxy generation" message.
...
Can probably comment out this message soon, once a few other issues are tidied up.
2011-07-11 04:23:30 +01:00
8e44a8e2b9
Properly regenerate physics proxy when a mesh is resized.
...
This is done in SOP.Resize(). More common code from callers needs to be refactored into this method to reduce confusing copy/pasting
2011-07-11 03:47:49 +01:00
0badf3718d
refactor: push the part of SceneObjectGroup.CheckSculptAndLoad() that actually deals with the part into a SceneObjectPart.CheckSculptAndLoad() method
2011-07-11 03:35:29 +01:00
2f3d0e209f
When a sculpt/mesh texture is received by a part on a callback request, don't do the unnecessary work of copying the base shape.
...
Just setting the new base shape is enough to reinsert the sculpt data and set the taint.
Also cleans up a few more left-in debugging messages.
2011-07-11 03:13:59 +01:00
ce85675e70
comment out accidential ProcessTaints physics debug line left in code
2011-07-11 02:29:51 +01:00
6a15464b0a
refactor: Make arguments to SceneGraph.UpdatePrimFlags() more readable
2011-07-11 02:29:19 +01:00
01b98c2e62
refactor: Make arguments for SceneObjectGroup.UpdatePrimFlags() more readable
2011-07-11 02:18:19 +01:00
e68ae44b6b
minor: remove mono compiler warning
2011-07-11 02:11:37 +01:00
c6d4304a04
refactor: very minor space insertion
2011-07-11 02:11:16 +01:00
c964114f7e
refactor: make argument to SOP.UpdatePrimFlags() more readable
2011-07-11 02:09:11 +01:00
457ba9d1a2
refactor: slightly simplify test
2011-07-09 02:27:47 +01:00
59aedbc94b
Rename SceneSetupHelpers.AddRootAgent to AddClient() to better represent its effects and return object
2011-07-09 02:25:40 +01:00
f99b89990c
Add scratch AvatarFactoryModuleTests with one test to do a partial check on AvatarFactoryModule.SetAppearance()
...
Baked texture set not yet checked, nor persistence of data in avatar service
This is a foundation for later npc related tests.
2011-07-09 02:21:56 +01:00
6963b8b046
refactor: Get LSLString(LSLInteger i) constructor to now call LSLString(int i) structure to remove code duplication.
2011-07-09 01:28:27 +01:00
df586c9d25
Raw int numbers (ex.LSL Constants) are displayed like "1.000000" when type cast to string
2011-07-09 01:27:12 +01:00
f680c13495
Fix osMatchString() so that it reports all instance of pattern matches, not just the first one.
...
This is a slight adaptation of the patch in http://opensimulator.org/mantis/view.php?id=4568 which doesn't apply directly since the underlying code was changed by earlier makopoppo patches.
Thanks makopoppo!
2011-07-09 01:24:30 +01:00
52c3671aa0
fix formatting issues from last patch
2011-07-09 01:17:35 +01:00
b983f38e2a
lsGetWindlightScene() returns raw int value, which makes unable to compare to another value with llListFindList()
2011-07-09 01:08:26 +01:00
04f8d0e45d
Made some LSL_Constant or LS_Constant raw int values
2011-07-09 01:08:13 +01:00
e7abf834d1
Instance-types-in-list fix for LSL/OSSL functions. This will fix llListFindList() which always returns -1 when you compare with the list from those functions.
...
*llCSV2List
*llGetAnimationList
*llGetLinkPrimitiveParams
*llGetObjectDetails
*llGetParcelDetails
*llGetParcelPrimOwners
*llGetPrimitiveParams
*GetLinkPrimitiveParamsEx
*osGetAgents
*osMatchString
*osGetLinkPrimitiveParams
*osGetPrimitiveParams
*osGetAvatarList
2011-07-09 00:49:53 +01:00
d79c6c8820
Rename SetSculptData() to SetSculptProperties(), since this is what it does (setting SculptData is done through the property)
2011-07-09 00:42:48 +01:00
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
c3d82bdcb1
When loading library asset set, only store an asset if it's different from an existing one with the same id.
...
We compare existing and loaded asset by doing an SHA1 on both, so that a changed library asset will still update the store.
This cuts asset library load time from 10 seconds to <1 sec.
Note, a fix on the previous commit revealed a bug where a library script cannot be copied except on the first login after a cache clear.
This is unrelated to this commit and needs to be fixed at some subsequent time.
2011-07-08 22:53:19 +01:00
a048ec3f95
stop the local inventory services connector from logging an error when an item id isn't found.
...
making this query is legitimate and so the log line can cause false positivies. It is up to callers to log an error if appropriate.
2011-07-08 22:34:03 +01:00
192bd1057e
fix bug where opening a library script would fail
2011-07-08 22:32:19 +01:00
5700c582ba
refactor: rename bool returning GetAgentInventoryItem() to CanGetAgentInventoryItem() to improve code readability
2011-07-08 22:28:17 +01:00
e8ad8593b6
refactor: eliminate redundant return statement
2011-07-08 20:58:44 +01:00
40300c886c
refactor: Factor out AddSubMesh() method from long CraeteMeshFromPrimMesher() method
...
Also remove some of the logging spam left in from the last commit.
2011-07-08 20:36:01 +01:00
b18ef976ff
Fix interpretation of physics mesh proxies from mesh data
...
As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format , some submesh blocks may just have the flag "NoGeometry" to signal that they provide no mesh data.
If a block contains this, ignore it for meshing purposes rather than suffer a ClassCastException
This fixes physics proxy meshing, so you can now walk through mesh doorways, properly stand on the trailer of mesh trucks, etc.
To get mesh physics proxy, the UseMeshiesPhysicsMesh must be true in a [Mesh] config section in OpenSim.ini (example in OpenSimDefaults.ini).
Convex hull physics not currently supported.
2011-07-08 19:43:22 +01:00
29034bc0e0
minor: code tidy up - remove a couple of Console.WriteLine() accidentally added in the last commit
2011-07-08 18:34:44 +01:00
36df9ae79a
refactor: Separate the OdeScene class into its own file from OdePlugin.cs, to improve code readability
2011-07-08 18:16:48 +01:00
1dcad4ac66
minor: commented out log lines for future use and very small code tidy
2011-07-08 17:58:01 +01:00
3bda7711b3
Switch the MeshUploadFlag CAP module on and off with the existing config AllowMeshUpload flag in [Mesh] (in OpenSimDefaults.ini)
...
Default is on.
2011-07-07 23:49:19 +01:00
2fbc98fa5c
Make MeshUploadFlagModule non-shared rather than shared (since each scene needs its own cap)
2011-07-07 23:37:23 +01:00
e91861fff2
Ensure that the max transfer distance is initialized correctly.
2011-07-07 09:12:57 -07:00
281e80ccf3
add MeshUploadFlag capability fixed mesh upload with latest mesh viewer thank you dahlia and lkalif for helping to make this happen!
2011-07-07 03:30:37 -07:00
af8773d6d0
Add TestClearCache()
2011-07-04 23:05:31 +01:00
cb02fc44f5
add TestExpireAsset()
2011-07-04 23:03:05 +01:00
f58de55c84
refactor: Move test setup code into setup method
2011-07-04 22:59:36 +01:00
bebc51a6e0
Make it possible to disable the file part of the flotsam asset cache
...
This matches the ability to disable the memory part
This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini
Default is true, so existing installations are not affected.
Improved fcache command feedback when various caches are disabled.
Re-enabled test for flotsam cache with file caching disabled.
2011-07-04 22:51:47 +01:00
5dc785bbf2
refactor: Split file cache manipulation code into separate methods, as has already been done for the memory cache
2011-07-04 22:30:18 +01:00
46f5893d55
Add basic flotsam asset cache test for retrieved cached asset.
...
Disabled temporarily since file system caching disrupts subsequent test runs
2011-07-04 21:35:15 +01:00
b8e7258051
If a user has the rights to edit a parcel's properties, then also allow them always to enter that parcel.
...
This is patch http://opensimulator.org/mantis/view.php?id=5567
Thanks Snoopy!
2011-07-02 01:14:29 +01:00
bb4cb16512
Add profile, merge, noassets and skip-assets options for loading/saving oars via RemoteAdmin
...
This is http://opensimulator.org/mantis/view.php?id=5453
Thanks Michelle Argus!
2011-07-02 01:05:03 +01:00
513d63455e
Create a very basic initial test which just creates an 'npc' and tests that the scene presence exists
2011-07-02 01:01:40 +01:00
ed12e38480
refactor: simplify existing npc code by creating them directly rather than indirectly via a timer
...
no obvious reason for doing this asynchonously, especially as the caller was sleeping in order to pick up the response anyway!
2011-07-02 00:18:15 +01:00
fba961c63f
Make default serverside_object_permissions = true since this better matches user expectations.
...
It also matches the default setting in the OpenSim.ini.example file
2011-07-01 23:06:46 +01:00
e765759f50
If OpenSim has been built from a git tree, then include version information automatically by dereferencing .git/HEAD
...
A blank bin/.version file will stop this being displayed.
2011-07-01 22:48:00 +01:00
759e855566
refactor: rename gitCommitFileName to manualVersionFileName since bin/.version doesn't necessary have to be a git hash
2011-07-01 21:47:30 +01:00
e41093635a
fix build break I just introduced
2011-07-01 21:37:03 +01:00
9f72fbcb75
Add an async inventory details sender to respond to FetchInventory packets.
...
If a user with a very large inventory right-clicks on their "My Inventory" folder, viewer 1 code will send a massive number of Fetchinventory requests.
Even though each is handled asynchronously via a pool thread, the sheer frequency of requests overwhelms the pool and freezes inbound packet handling.
This change makes the first Fetchinventory thread also handle subsequent requests, freeing up the other threads.
Further efficiencies could be made by handling all the items in a particular FetchInventory request together, rather than separately.
2011-07-01 21:25:40 +01:00
5c18ebf424
Allow physics proxy generation for meshes using new asset format.
...
Fix an invalid cast exception while decoding new mesh asset format.
2011-06-29 17:36:41 -07:00
c84a1bd99f
Don't follow inventory links of links.
...
This is to avoid problems with corrupt inventories where an inventory link target points back at the source's folder
No viewer has been observed to set these up as of yet. If this ever happens, we will need a more sophisticated solution to track sent folders within the recursion
2011-06-29 01:33:41 +01:00
1b4c08730e
refactor: simplify redundant double containing folder check
2011-06-29 00:56:35 +01:00
3f0b8db0c1
If an inventory link target is in the same folder as the source, then don't recursively request that folder.
...
Currently, this should never actually happen but certainly best to handle this case
2011-06-29 00:54:53 +01:00
22f25fae38
Hack around with the NPC module to get osNpcCreate() partially working again.
...
This now creates an avatar but appearance is always cloudy.
Move doesn't work.
Really, creating an NPC should only involve a ScenePresence rather than doing anything with IClientAPI, since an NPC has no viewer to communicate with!
2011-06-29 00:28:22 +01:00
ee92f22f2a
[PATCH 2/2] [FIX] osGetPrimitiveParams() and osSetPrimitiveParams()
...
crashes throwing System.NullReferenceException
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-06-28 11:48:29 -04:00
80010f8908
[PATCH] osSetSpeed() will accept float number
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-06-28 11:48:28 -04:00
ffa790d69d
[PATCH] Get osGetWindParam() and osSetWindParam() accessible
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-06-28 11:48:28 -04:00
882d5c82b3
[PATCH 1/2] Fixed the function names of some OSSL functions shown as
...
threat-level check error message
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-06-28 11:48:28 -04:00
36e2054760
minor: temporarily comment out the local status notify friends messages seen on login/logout, since it's a bit noisy on the console.
...
Please uncomment if/when this is still needed.
2011-06-27 23:12:54 +01:00
5daac0584a
Fix bug in reset user password where entering an invalid name would cause an exception. Also, convert this commands log output to console output.
...
Console output is more appropriate for console commands. The log only gets one side of the conversation anyway (since it doesn't necessarily record command inputs).
2011-06-25 00:08:14 +01:00
296774495b
Implement "set user level" console command to set the user level (which determines whether a user has a god account)
...
Adapted from Makopoppo's patch in http://opensimulator.org/mantis/view.php?id=5552 . Thanks!
2011-06-25 00:03:34 +01:00
56dcc51094
Add a command "show account <first-name> <last-Name>" to the user account service that will show the given user details
2011-06-24 23:54:37 +01:00
7545692f32
Changed actual default values of 'ServiceConnectorModule' and 'MessagingModule' in [Groups] section in accordance with OpenSim.ini.example descriptions
2011-06-24 22:40:21 +01:00
0dd3281caf
Optionally, don't delete previously compiled scripts on startup
2011-06-24 22:07:20 +01:00
afb1248e39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-24 21:57:16 +01:00
1a0a9d2290
Implement the latest mesh mechanism so that rezzing the uploaded mesh now works again.
...
Many thanks to the aurora project for pioneering this.
This code is almost certainly not bug free, but it does at least appear to handle simple meshes (except when the viewer crashes - but it is beta!).
2011-06-24 21:54:01 +01:00
1cad116b1d
Merge branch 'master' of /home/opensim/src/opensim
2011-06-24 16:33:40 -04:00
75199a0d2c
RegionReady Module:
...
Add notification to neighbors when logins are enabled.
2011-06-24 16:20:13 -04:00
37a7c16734
minor: method documentation
2011-06-24 21:01:48 +01:00
de20f0603f
Tell hypergridders when their teleports fail because of the 4096 limit rather than just saying "destination not found"
...
Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module
This allows us to explicitly tell the hypergridder why the teleport failed (region out of range).
It also allows people on regions that are within range (on a large source grid) to teleport.
The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini
Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased.
The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
2011-06-24 19:49:05 +01:00
302d72701d
BulletSim initial checkin
2011-06-20 17:24:42 -07:00
7819b4a794
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-16 17:15:12 -07:00
409738726d
Added a couple of guards and warnings to the MapImage/MapImageServiceModule.
2011-06-16 17:14:41 -07:00
ad84728aba
Add localID to physical object creation functions.
2011-06-15 11:31:32 -07:00
29da57e380
Add the PhysActor to the correct SOP when duplicating a physical
...
prim. Thanks, MisterBlue
2011-06-15 11:26:45 -07:00
7a4fbdac7c
Added an expiring cache for region information to the
...
RemoteGridService connector. Timeout is currently set at five
minutes. Negative results are not cached.
The result is that operations like send an instant message do
not have to go through the grid service every time.
2011-06-15 11:22:51 -07:00
603dbea190
tweak messages. Make verbose inventory item save message give the item name as well as item id and asset id
2011-06-14 00:51:18 +01:00
822b9e085f
Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response.
...
Changed the experimental capability introduced a couple of commits ago: now sending that extra information as part of the response in the SimulatorFeatures cap.
2011-06-13 10:21:29 -07:00
c62ccc75a1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-13 09:14:17 -07:00
ecb28ae130
V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes
2011-06-13 09:13:44 -07:00
ab11835aeb
Same processing of the "/" in the MapImageService Cap as the one in the login service.
2011-06-13 07:59:28 -07:00
0e4db3ca39
Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.
2011-06-13 07:56:52 -07:00
dc978d02a7
match water color for warp3d map tiler and adjust lighting
2011-06-13 12:37:43 +01:00
4b9de140ab
Add credit and link to SimianGrid project. Thanks, guys!
2011-06-12 22:25:30 -07:00
95e050130c
People are bound to forget the '/' at the end of MapTileURL, so let's correct that from the inside.
2011-06-12 22:10:16 -07:00
2e77518c6d
bit depth: 24!!! begeez! -- zoom levels work now.
2011-06-12 21:51:26 -07:00
78c16da544
A few bug fixes on map V2. Zoom level weirdness still there.
2011-06-12 17:05:45 -07:00
fd57c91b4a
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
2011-06-12 15:37:42 -07:00
06e254c392
A few more cleanups on the way to close http://opensimulator.org/mantis/view.php?id=5516 once and for all. Moral of the story: don't send AgentOnline/Offline to viewers with a zero-length array.
2011-06-11 17:48:19 -07:00
e1ca77a0db
Only send AgentOnline to the client if the friendsOnline list has elements. Also, increased the timeout on UserAgentServiceConnector, StatusNotification again.
2011-06-11 17:22:35 -07:00
d992779397
Switched order of SQL statements in Friends migration -- resulted in the wrong key
2011-06-11 09:36:57 -07:00
e07d71d298
Added a Sleep in between each site call, to slow the xml-rpc requests down.
2011-06-10 21:17:34 -07:00
5f311c91c7
More tweaking on the UserAgentServiceConnector: add constructor that does not do DNS lookup, and use that for friends notification.
2011-06-10 21:07:50 -07:00
0ae022d688
Decreased timeout of HG StatusNotification to 4secs. http://opensimulator.org/mantis/view.php?id=5516
2011-06-10 20:59:57 -07:00
487cb51f69
3rd way of reseting the HG Map. This time, don't use the grid service; instead keep track of which map blocks each client has seen in the region, and reset exactly those when the client closes.
2011-06-10 17:22:17 -07:00
9a62bfab0e
If the flotsam asset cache console command "fcache clear" is specified on its own, clear both memory and file caches
2011-06-11 00:50:20 +01:00
b13b54c526
Make the internal flotsam asset cache defaults match config-include/FlotsamCache.ini.example. Enable the flotsam console commands even if FlotsamCache.ini isn't present.
...
For the most part, defaults are made to match those already in FlotsamCache.ini.example.
The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file. This can be tweaked if necessary.
Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default).
Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache.
2011-06-11 00:04:21 +01:00
fc7e17baf7
When serializing objects, stop accidentally using the green text colour value for alpha
...
This addresses http://opensimulator.org/mantis/view.php?id=5111
2011-06-10 21:49:25 +01:00
c7bdb66a1f
Added missing "Old Guids=true" to ConnectionString
2011-06-10 21:10:37 +01:00
804fe2d9b0
Save the sun's position in OARs
2011-06-10 20:55:58 +01:00
08db3c5a8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-10 20:42:15 +01:00
b5518dc906
minor: Add some commented out destructor logging messages for potential future use.
...
At the moment, client and scene objects are being garbage collected as expected, at least in simple scenarios.
2011-06-10 20:40:14 +01:00
eeac2275c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-10 09:17:06 -07:00
98d1e7768a
New method for resetting the map on HG: do it only once upon changing grids, and reset only exactly the map blocks that had regions in them. WARNING: this fetches all the regions from the Grid service, so there is a chance that this is a really bad idea in large grids. Pushing it for testing.
2011-06-10 09:16:43 -07:00
387b228d68
partial update for new mesh asset format - handle both old and new formats for physics mesh
2011-06-10 00:38:38 -07:00
9149ef6c89
For MySQL, migrate region tables to the MyISAM storage engine rather than InnoDB
...
Using MyISAM proves vastly faster for persisting scene objects.
For instance, a scene object that took 9 seconds to persist before now takes 1. This also improves the experience of loading large OARs.
We don't use any of the transactional features of InnoDB.
The only thing that may have an impact is that InnoDB does row locking on inserts while MyISAM does table locking.
However, field reports say there is no noticeable difference.
2011-06-10 02:33:50 +01:00
d780500c58
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-10 02:29:30 +01:00
2bc8dcfdbd
minor: add method doc to make it clear that click action is fired when the click action is changed, not when a prim is clicked
2011-06-10 02:27:45 +01:00
8d3a8a0a81
The map breakage is actually at 2048!
2011-06-09 16:51:47 -07:00
e3e1f6308d
Change the name of the newest command to "show names" so that it doesn't conflict with the existing "show users"
2011-06-09 16:11:47 -07:00
4cf60c5d9d
Removing special casing on failures. This may also fix reports of this issue:
...
22:07:53 - [USER AGENT CONNECTOR]: remote call to http://hg.osgrid.org:80/ returned an error: Requested method [locate_user] from 127.0.0.1 threw exception: Object reference not set to an instance of an object at OpenSim.Services.HypergridService.UserAgentService.LocateUser (UUID userID) [0x00000] in <filename unknown>:0
2011-06-08 19:51:48 -07:00
49e4e53928
Consistency fix on the last commit.
2011-06-08 16:41:58 -07:00
2a46f756d6
Fixed a compilation problem. Also added a lengthy comment on the Map hack, so that it never goes unnoticed again.
2011-06-08 16:38:25 -07:00
1bd712c541
Reverting the [HG]MapModule to its buggy behavior above 4096. Ppl seem to prefer the color blue, and I have given up trying to make things work above 4096.
...
Revert "Improved reuse on the WorldMap/WorldMapModule.cs"
This reverts commit d473d9975e
2011-06-08 16:12:47 -07:00
80fc607d75
Fixed "Unknown User" listed as creator/owner on prims created with the Build button by foreign visitors. Added command to the UserManagementModule to list all the known bindings between user UUIDs and their names: show user-names.
2011-06-08 16:01:33 -07:00
9759b2a4bb
Added EventManager.OnPrimsLoaded, an event that modules can hook up onto so that they know when the scene's objects have been loaded from the DB.
2011-06-08 15:18:14 -07:00
90f657d77d
Deleted wrong debug message.
2011-06-08 13:45:38 -07:00
61f1c2b2c5
Write estate errors on startup to the log
2011-06-07 20:20:04 -07:00
39323055bd
When a plugin fails to load because a DLL is missing, log which DLL it is
2011-06-07 20:17:49 -07:00
eabfc9ca15
Added error message to help understand http://opensimulator.org/mantis/view.php?id=5527
2011-06-07 20:05:24 -07:00
3307db5d4a
This hopefully fixes all issues with online/offline notifications across grids. http://opensimulator.org/mantis/view.php?id=5528
2011-06-07 19:36:04 -07:00
02b40670be
This makes the display names work better for foreigners
2011-06-07 12:10:57 -07:00
41627bdf8a
Remove scary error message
2011-06-07 12:09:32 -07:00
f5d82350bb
This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
2011-06-07 10:51:12 -07:00
1a23d322ac
More on the hunt for the slow down on HGFriendsModule. - Don't requests the online friends on foreign grids. If this works, there's another way of getting that info.
2011-06-06 19:52:50 -07:00
dce0e46eaa
Moved the Mono Addins declaration of the HGFriendsModule to where the one for FriendModule is -- CoreModulePlugin.addin.xml (trying to hunt down the slowness reported by Nebadon related to HGFriends)
2011-06-06 18:20:02 -07:00
e77ca65e57
This should make offline IMs work again. It should work for incoming foreign IMs where the local recipient is offline. I can't test any of this, because I don't run an offline IM server.
2011-06-06 17:46:34 -07:00
6861606b6d
Narrow down the exception catching to exactly the exception of interest. This may decrease the time of processing prims with broken user data.
2011-06-05 19:46:29 -07:00
205b2f7ea4
Remove the unmaintained 'CMS' framework, which was really a 'source-control' experiment from 2008.
...
This hasn't been touched for about 2 years and I haven't being using it. If this is wrong then please let me know.
2011-06-04 03:01:52 +01:00
fe471b6424
Extend TestGiveInventoryFolder() to test giving back the freshly received folder
2011-06-04 02:44:53 +01:00
12b1cbf8bf
Fix give inventory tests to use different users rather than (accidentally) the same user. Extend TestGiveInventoryItem() to test giving back the same item.
2011-06-04 02:39:26 +01:00
fe890554fb
insert an InventoryArchiveUtils.FindItemsByPath() to return multiple items rather than just the first one
2011-06-04 01:37:01 +01:00
896f039513
create TestGetInventoryItem()
2011-06-04 00:51:49 +01:00
1543fd7fff
extend TestGiveInventoryFolder() to check for the receipt by user 2
2011-06-04 00:20:54 +01:00
66004a9375
If an llSensor() is in an attachment, make the detection cone face in the direction of the avatar, not the relative rotation of the attachment towards the avatar.
...
This is effectively a copy/paste from 459323a
2011-06-03 23:43:09 +01:00
d09210da86
minor: add in method print out to new test
2011-06-03 23:15:31 +01:00
527e10a04e
add stub UserInventoryTests.GiveInventoryFolder(). Not yet complete
2011-06-03 23:13:05 +01:00
cf86ba5559
Added prefix HG to the name of the landmark item in inventory, as a soft reminder that the landmark belongs to a place in another grid. People can change the name, but that's their decision.
2011-06-03 11:48:24 -07:00
623706d988
HG Landmarks bug fix: pull landmark asset data from user's asset server when user is traveling.
2011-06-03 11:33:44 -07:00
fde3e704d3
oops
2011-06-03 10:50:55 -07:00
e33cedfd42
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
995b893e4c
HG Landmarks being created. WARNING: new config var under [HGInventoryAccessModule], Gatekeeper.
2011-06-03 09:04:34 -07:00
76c60f1f99
Moved CreateNewInventoryItem to the InventoryAccessModule in preparation for supporting HG landmarks.
2011-06-03 08:27:01 -07:00
2a12d143c2
HG IM: increase the timeout value
2011-06-02 10:44:10 -07:00
6312eea459
HG IM bug fix: grid_instant_message was being placed in the default port instead of the specified one.
2011-06-02 10:14:26 -07:00
65c71050cc
Extra debug message
2011-06-02 09:39:29 -07:00
3c15c0b264
Added test IM client.
2011-06-02 09:39:09 -07:00
4696a9c95e
Bug fix on HG IM.
2011-06-02 08:13:54 -07:00
f2f30a7890
HG Friends bug fix: connector was shrinking principalID to UUID.
2011-06-02 07:26:40 -07:00
c13acdf5a1
This is the better solution: make the combined key be only on the first 36 characters of each field -- that's the UUIDs. Thanks coyled. WARNING: Again, people who have gone through this migration and failed need to run it manually.
2011-06-01 20:19:22 -07:00
43ecc46a22
It looks like there's a better solution for that problem.
...
Revert "Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually."
This reverts commit 3fa54a156a
2011-06-01 20:09:59 -07:00
3fa54a156a
Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually.
2011-06-01 20:02:26 -07:00
46cdd442a8
[Profiles] --> [Profile]
2011-06-01 18:18:31 -07:00
777f57d946
Re-Apply Use current TravelingAgent if the the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady""
...
This reverts commit 0a430bbffb
2011-06-01 18:47:06 -04:00
0a430bbffb
Revert "Use current TravelingAgent if the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady"
...
This reverts commit 4b9e446c62
2011-06-01 18:10:56 -04:00
ac4d080aaf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-01 17:01:40 -04:00
984b801dd9
Merge branch 'master' of /home/opensim/src/opensim
2011-06-01 17:01:08 -04:00
4b9e446c62
Use current TravelingAgent if the login failure reason is "Logins Disabled" to fix NullReferenceException, allowing agent to login to fallback region when logins are disabled by "StartDisabled = true" or when logins are disabled by RegionReady
2011-06-01 16:57:01 -04:00
b0ed0e63dc
Adding boolean alias for commandline switches like -save_crashes=yes
2011-06-01 21:14:16 +01:00
54096db30b
Fix: The command line switches 'save_crashes' and 'crash_dir' haven't actually worked
2011-06-01 21:06:43 +01:00
5fb0455e92
Updates to MSSQL to most recent compatibility, also included Windlight support. Needs plenty of testing but clean install and migration from 0.6.9 have been tested and work, a few indexes still need to be added for performance.
2011-06-01 21:01:04 +01:00
a3e0895f12
a few minor formatting tweaks
2011-06-01 20:55:03 +01:00
c43ad8a0e7
A final couple of tweaks to GroupsModule.cs. Remove unneeded delegate, and prettify codeing style/formatting
2011-06-01 20:51:52 +01:00
8bacf56e46
revert the prematurely included groups patch, yet again
2011-06-01 20:51:38 +01:00
929bdba346
Merge branch 'master' of /home/opensim/src/opensim
2011-06-01 13:47:38 -04:00
aed6e74080
Add alternate region handling for url based logins as found in login to "home" or "last"
2011-06-01 13:44:20 -04:00
5711ada5c9
Fix dumb sql mistake in MSSQLGenericTableHandler.Delete()
2011-05-31 22:42:18 +01:00
c67fa72d56
When sending an LLUDP MoneyBalanceReply message, fill out the transaction item description even though there is none.
...
This is to deal with a problem in libomv where calling ToBytes() without this crashes because of an ItemDescription.Lnegth dereference.
2011-05-31 19:57:08 +01:00
8129e64e2a
Fill in the new OwnerData field in the LLUDP ScriptDialog message.
...
If we don't do this then viewer 2.8 crashes.
Resolves http://opensimulator.org/mantis/view.php?id=5510
2011-05-31 19:25:01 +01:00
392d270264
revert the patch that accidentally got added in the last commit
2011-05-31 18:49:38 +01:00
c4b265aeae
update libomv libraries to 0.9.0
...
this is a prerequisite to fixing llDialog issues for the latest Linden viewers, since they are now making use of a new OwnerData field in the ScriptDialog message
2011-05-31 18:47:13 +01:00
44371118a2
Made GetMapImage public in the Hyperlinker
2011-05-30 20:23:45 -07:00
b81a304baa
Made the GatekeeperConnector a public property.
2011-05-30 20:12:05 -07:00
e14b7ec9e1
HGWorldMap: don't send map blocks of hyperlinks that are farther than 4096 cells from the current region.
2011-05-30 17:19:46 -07:00
d473d9975e
Improved reuse on the WorldMap/WorldMapModule.cs
2011-05-30 17:15:55 -07:00
5cb7d8bc71
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-28 13:52:27 -07:00
d5326197ac
Fixed an issue with the response of CreateAgent over the SimulationConnector.
2011-05-28 13:52:06 -07:00
3326e417b4
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 16:21:30 -04:00
c7e18f9017
Adding an event to signal that logins are enabled
...
Added an event to signal the eabling of logins and added an alert to send to a configured service.
2011-05-28 16:20:10 -04:00
d2c2a4301b
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 00:39:21 -04:00
99f42c0a6e
Add option to disable logins
...
This just covers script loading for now. More to come.
2011-05-28 00:35:06 -04:00
6f4a2685cf
minor: remove mono compiler warning
2011-05-27 23:43:31 +01:00
28cd03cda5
fix bug where generic sqlite table delete wasn't working.
...
this would have caused dupe links bugs when using the sqlite adaptor
2011-05-27 22:54:59 +01:00
b0c9696de0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-27 21:21:01 +01:00
e9988a3728
Make sure culture is en-US when saving archive related xml.
...
This might resolve http://opensimulator.org/mantis/view.php?id=5475
2011-05-27 21:19:20 +01:00
fcef4688a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-27 13:07:39 -07:00
76525be7b2
HG lures working! Friends can offer friends HG teleports via the profile. WARNING: additional configuration for HG inis -- see *Common.ini.example
2011-05-27 13:07:18 -07:00
4e4db749eb
If parsing fails in the primitive base shape (which prints out a debug log message), also print out the name and uuid of the part containing this shape.
...
This is to help in diagnosing parsing failures.
2011-05-27 20:59:35 +01:00
0af5bb239f
When saving an iar, don't chase down link asset IDs (since these points to other items rather than real assets)
...
This bug had no practical effect other than to make "save iar" misreport the number of missing assets
2011-05-27 19:39:03 +01:00
4087a453dc
Avoid a scary warning message about null replies from the user agent service.
2011-05-27 08:53:26 -07:00
d60f525baa
HG inventory transfers over the profile working.
2011-05-27 08:19:40 -07:00
36f9d55c36
Added a BasicProfilemodule so that the profile-based actions (like give inventory, etc) work. This is just a mock profile, the same for all users, and with no DB backend behind it -- meaning that nothing will be saved. For serious profiles, use 3rd party implementations.
2011-05-27 07:00:36 -07:00
0d29f73916
Commented a few extra debug messages.
2011-05-26 19:13:03 -07:00
b17afe43c4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-26 15:52:34 -07:00
0c58a9e680
HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service.
2011-05-26 10:04:48 -07:00
91ec1a572a
improve help information for "appearance show"
...
at the moment, this just performs a baked avatar check for everybody in the region. If the check returns 'corrupt' then a baked texture is missing and other avatars will continue to see the gas ball.
2011-05-26 02:48:47 +01:00
3270f4353e
Add --noassets option for "save iar"
...
Like "save oar", this saves an iar without assets
This can be useful for backup when you know the required assets will still be present (e.g. you're backing up the assets db separately).
This also bumps the iar format version to 0.3 and 1.2 respectively.
0.3 is backward compatible with previous opensim versions
1.2 is used if the --profile switch is specified. It is only compatible with 0.7.1 presently.
2011-05-26 02:22:52 +01:00
c7e46e8a51
Bump OAR file format version up to 0.7 for this development cycle.
...
This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time.
This addition is backward compatible with previous opensim releases
2011-05-26 01:37:15 +01:00
ab855e6f8d
fix bug where outfit folder links could not be deleted
2011-05-26 01:32:36 +01:00
d9889ae2e7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-26 01:28:48 +01:00
6f4d079fc5
Add a --noassets option to "save oar".
...
This switch stops any assets being saved in the oar.
This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available.
2011-05-26 01:27:01 +01:00
587b17e23b
HG: Renamed, shuffled some interfaces around. Move them all to IHypergridServices.
2011-05-25 12:37:37 -07:00
5c2168cae7
HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing.
2011-05-25 12:32:21 -07:00
e398c33648
Add PayPrice to serialization format Xml2
2011-05-25 12:17:46 +01:00
ef3f6b4e63
Revert "Make client event handlers for money only work on root agents"
...
This reverts commit a8913141c0
2011-05-24 16:33:51 -04:00
a8913141c0
Make client event handlers for money only work on root agents
2011-05-24 16:07:48 -04:00
e19031849e
Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.
2011-05-24 09:38:03 -07:00
28c25d8477
Allow disabling the legacy backup mechanism to avoid the object clone if
...
backup is not used.
2011-05-24 04:03:51 +01:00
24f28d3534
HG friends: Status notifications working. Also initial logins get the online friends in other grids.
2011-05-23 19:45:39 -07:00
61d4291da5
Create a method to force the script engine to save state from outside
2011-05-24 03:17:12 +01:00
178d541dca
Add an event for an orderly region shutdown that fires once per region before
...
the SceneGraph is torn down.
2011-05-24 01:19:48 +01:00
24c00acedc
Fix Mantis #4429 : Allow llGiveInventory to work across sim borders.
2011-05-23 02:52:28 +01:00
336665e035
More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
2011-05-22 16:51:03 -07:00
fed3cc630e
File to be removed
2011-05-22 15:35:40 -07:00
dc95e38e42
Add stubs for unimplemented lsl functions
2011-05-22 14:59:18 -04:00
58c53c41de
Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
2011-05-21 16:48:00 -07:00
80457111e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-21 14:07:30 -07:00
bb9b317f15
Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead
2011-05-21 01:05:20 +01:00
4073f10133
rename test helpers enclosing package from Setup to Helpers
2011-05-21 00:51:34 +01:00
94553d4753
rename UserInventoryTestsUtils -> UserInventoryHelpers for consistency
2011-05-21 00:48:01 +01:00
156cc1418b
test helper rename for consistency
2011-05-21 00:44:58 +01:00
d7e5b76d73
refactor: rename AddSceneObjectItem to AddSceneObject
2011-05-21 00:39:42 +01:00
084059319c
refactor: move scene object item creation code into TaskInventoryHelpers
2011-05-21 00:37:20 +01:00
9103fe84d5
move test task inventory notecard item creation into a new TastInventoryHelpers class
2011-05-21 00:25:58 +01:00
0050bb438c
refactor: use SceneSetupHelpers.CreateSceneObject()
2011-05-21 00:15:22 +01:00
534ee52a12
rename UserProfileTestUtils to UserAccountHelpers to be consistent with other test helper names
2011-05-21 00:11:52 +01:00
3fed61a5d5
refactor: in TaskInventoryTests, use UserProfileTestUtils.CreateUserWithInvetory()
2011-05-21 00:07:24 +01:00
bc43cef581
minor: remove mono compiler warning
2011-05-21 00:05:00 +01:00
90567a9eaa
refactor Scene.RezObject() to use AddNewSceneObject() rather than copy/pasting code with small differences
2011-05-21 00:02:53 +01:00
f2095ea279
refactor TestRezObjectFromInventoryItem()
2011-05-20 23:45:39 +01:00
4b0fc4faef
implement Scene.GetSceneObjectGroup(string name) to match the equivalent GetSOP method
2011-05-20 23:41:14 +01:00
91a9f30b16
implement Scene.GetSceneObjectGroup(UUID fullID) using existing index
2011-05-20 23:34:34 +01:00
7ed419217f
add test for rezzing an object from a prim item
2011-05-20 23:22:27 +01:00
9fc29e1595
Implement llGetLinKNumberOfSides().
...
Based on code in http://opensimulator.org/mantis/view.php?id=5489 Thanks onesong.
2011-05-20 20:19:32 +01:00
6e7b588235
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-20 20:06:51 +01:00
a2c19847b4
ScriptEngine/Shared: Fix bug 5473 (v2).
2011-05-20 20:00:55 +01:00
d21e9c755f
HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
2011-05-19 16:54:46 -07:00
584bce36ac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-19 01:35:11 -04:00
926a100652
Add stub for llGetLinkNumberOfSides(integer link)
2011-05-19 01:34:11 -04:00
bdd7849094
Allow item links to be deleted even when other deletes and purges are disabled.
...
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved. When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
2011-05-19 00:51:14 +01:00
6dcc87b1ad
Accidentally committed too early
...
Revert "Allow item links to be deleted even when other deletes and purges are disabled."
This reverts commit 491279f99a
2011-05-18 00:23:35 +01:00
c562b9ef19
correct small mistake in "delete object name <name>" usage summary
2011-05-18 00:22:09 +01:00
491279f99a
Allow item links to be deleted even when other deletes and purges are disabled.
...
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved. When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
2011-05-17 22:31:16 +01:00
784f70f704
don't throw a null reference if an inventory link target doesn't exist when we're inspecting in order to send the required inventory folders
2011-05-17 02:25:05 +01:00
467d7060ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-17 01:58:51 +01:00
4232b1a89b
convert tabs to spaces
2011-05-17 01:57:18 +01:00
901448a8eb
Fixup documentation for AutoBackupModule.
2011-05-17 01:55:54 +01:00
a2f034c554
Changed yet more Warns to Debugs.
2011-05-14 13:36:55 -07:00
be6feff331
Also changed a couple of messages in WebUtil from Wanr/Info to Debug.
2011-05-14 13:09:59 -07:00
082a9ecd31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-14 12:57:34 -07:00
a3aa839d75
Stop spamming Nebadon's console when assets aren't found in the asset server.
2011-05-14 12:56:50 -07:00
e3b8d42bbc
refactor: improve PrimLimitsModule to call ILandObject.GetSimulatorMaxPrimCount() rather than use copy/pasted code
2011-05-14 02:51:29 +01:00
340e3ccf16
refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() instance methods since it didn't make sense to use anything other than the instance themselves.
2011-05-14 02:42:47 +01:00
bef1ffa7db
simplify code in llGetParcelMaxPrims() to use existing code in LandObject rather than duping the algo
2011-05-14 02:34:46 +01:00
1d86079141
Correct llGetParcelMaxPrims() to use the same calculation as used elsewhere instead of the old 0.22 prims/meter squared fudge factor.
...
Thanks to tglion for this.
2011-05-14 01:26:04 +01:00
26ce1d27d0
Minor doc change to see if this provokes a good panda build
2011-05-14 01:07:06 +01:00
64d868fb64
When loading an OAR that doesn't have parcels, create a default parcel
2011-05-14 00:41:32 +01:00
cb6cd3714e
The get_grid_info REST call now encodes XML Entities
2011-05-14 00:31:54 +01:00
7a54638b57
Swapped the two restart command descriptions each other
2011-05-14 00:25:31 +01:00
5573fcfa93
Fix adding/removing/replacing outfits in viewer 2
...
To get this to work, I had to disable the dupe link check I put in a couple of commits ago.
When the viewer adds wearables to an existing outfit, it first requests deletes of all the existing links before creating a new set.
Since these messages are async, the creates were being received before the deletes had a chance to complete, resulting in missing current outfit links.
However, the dupe check shouldn't be as important now that broken links have been fixed - it was the broken links that were causing the client to create dupes.
Tested on kokua 0.1.0 WIP and SL 2.6.3. I now have no problems managing outfits on my standalone.
2011-05-14 00:10:27 +01:00
59d8588ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-05-13 12:03:16 +01:00
eceedba23b
Fix the cert validation handler so that it will not block other parts of
...
the server doing ssl successfully.
2011-05-13 12:02:49 +01:00
e39dec6f37
Hopefully this fixes offline messages. The problem was: the server is not setting the ContentLength of the response. That comes up to OpenSim as ContentLength=-1, which made the existing test fail.
2011-05-12 20:48:24 -07:00
1cc70df3b4
One more thing printed out. #OfflineIM
2011-05-12 20:20:08 -07:00
84f2a779b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-12 19:57:15 -07:00
301321c853
Instrument the heck out of offline messages. THIS IS VERY VERBOSE.
2011-05-12 19:56:59 -07:00
5f9edd195c
Fix broken inventory links on viewer 2.
...
It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s
2011-05-13 03:24:19 +01:00
691283c44e
One more debug message for offline IMs.
2011-05-12 19:10:44 -07:00
9e310a0c0f
Sequencing the using and try clauses as they were before, but this shows that that obsolete function is not catching 404's as it should...
2011-05-12 18:53:22 -07:00
42bfab84b8
Bummer, can't print the data I wanted to see. Printing just the context.
2011-05-12 18:47:14 -07:00
f54a36bd59
Tracking a problem with offline IMs coming in as null list.
2011-05-12 17:34:26 -07:00
e9e4c009b4
This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil.
2011-05-11 20:44:03 -07:00
9988bff9e3
Add a smidgen of method doc about the fact that item links reuse the asset id item slot
2011-05-12 03:18:53 +01:00
ac12ace6f1
Prevent viewer 2 from creating a duplicate outfit inventory links.
...
I believe this is safe since there is a 1-1 correspondence between link item and worn item (i.e. you can't be wearing the same item at two spots simultaneously in one outfit).
This should stop lots of duplicate links being created when viewer 2 is used.
However, this doesn't prevent broken inventory links, which I believe is timing related since the effect is not consistent (e.g. keep relogging and the viewer should end up seeing them correctly) . I think we actually see this problem on viewer 1 as well.
It might be easier just to implement the Fetch*2 inventory caps which are documented at http://wiki.secondlife.com/wiki/Inventory_API . WebFetch* has been deprecated by Linden Lab since viewer 2.5.1 and according to the sl wiki, "has numerous bugs".
2011-05-12 02:46:13 +01:00
7fa2489a6e
Revert "Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs."
...
This reverts commit 5548f83750
2011-05-11 13:15:27 -07:00
af2e12d2b4
One more debug message. Don't use this unless your name is nebadon.
2011-05-11 10:43:50 -07:00
5548f83750
Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs.
2011-05-11 10:21:42 -07:00
47735468d2
Somewhat reverting the last commit. The viewer ignores 255's on tiles that were previously on, so we need to send 254 (offline) explicitly. Also removing the +/-4 for HGMap, because it makes the map flicker.
2011-05-10 09:02:25 -07:00
e1a4a8d857
Changed the Access flag on HGMap to 255 (does not exist) and clarified the other value 254 too. Meanings taken from libomv.
2011-05-09 18:28:16 -07:00
7e2b35bbb3
Fixes gray tiles around +/-4 when user clicks on an empty tile. Affects regions above 4096 primarily.
2011-05-09 11:35:41 -07:00
8a5f6dc7a5
Fixes gray tiles on map search for viewers 1.
2011-05-09 10:25:42 -07:00
c0a69bfaab
The map is seriously broken. This doesn't fix it, but at least provides one more piece of data that seems to be required -- agent flags, which seem to be different in Viewer 2. WARNING: changes IClientAPI.
2011-05-08 22:50:04 -07:00
fd66903f74
Convert the prim count module into a permissionsmodule
2011-05-09 03:16:01 +01:00
527b4e7c7e
Incremental - Just did some cleanup of comments and class name change to clean up from using BareBonesNonShared as a template.
2011-05-09 03:14:54 +01:00
279ed08de1
Incremental patch to add config options to enable/disable the prim limits module to OpenSim.ini. EnforcePrimLimits is set to false by default to emulate the current behavior.
2011-05-09 03:14:48 +01:00
65d595597d
Adds an optional module to enforce prim limits on a given parcel Takes into account acculmitive prim allowance when multiple parcels are owned by the same avatar on the same region. Does not handle prims that are moved by a script or account for temporary objects at the time of creation. other wise handles all tested cases including: Creating a new object from the build menu Moving an object from another parcel duplicating an object via shift move rezing an object from a script
2011-05-09 03:14:41 +01:00
2b88d8f93f
Add commands to delete objects by name, UUID, creator or owner
2011-05-09 01:28:23 +01:00
00f10c900a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-08 16:51:41 -07:00
3a5e841b0b
Fix content-type to be application/x-www-form-urlencoded
2011-05-08 16:51:04 -07:00
a650c74d23
Comment verbose debug message in GetTexture
2011-05-08 16:50:36 -07:00
c8b9558039
Also compress the actual fatpacks
2011-05-08 23:52:31 +01:00
e345f03895
Remove a spammy debug I left in. Disable TP cancel button at the point
...
of no return.
2011-05-08 22:05:33 +01:00
1be67914fa
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-05-08 20:20:40 +01:00
9688db2f68
Enable compressed (gzip) fatpack transfers.
2011-05-08 20:20:00 +01:00
25809caaeb
Mantis #5472
2011-05-08 09:28:15 -07:00
72fb0d5b93
Mantis #5470 -- add forgotten MSSQL's GridUserStore. Thank you MrMonkE
2011-05-07 14:56:59 -07:00
d4fcba08af
Add module with "appearance show" command.
...
At the moment, this command just asks the AvatarFactory to perform the existing baked texture check for each avatar in the simulator and returns "OK" or "corrupt".
This is for debugging purposes
2011-05-07 01:06:55 +01:00
737add1683
Removed SimpleRegionInfo, which was obsolete and not used anywhere.
2011-05-06 17:02:46 -07:00
eaa33cf478
adjust avatar terse update packet filter distance error threshold based on avatar speed
2011-05-06 16:56:54 -07:00
b140aef87a
refactor: simplify ConfigSettings
2011-05-06 22:51:36 +01:00
04ecd748d9
remove further mono compiler warnings
2011-05-06 22:47:41 +01:00
3d095e84d6
minor: remove mono compiler warnings
2011-05-06 22:45:03 +01:00
f5ec332474
remove obsolete [StandAlone] config section parsing, none of which was actually used since being superseded by the connector architecture in 0.7
2011-05-06 22:41:07 +01:00
913e6b70c6
minor: slightly shorten "show digest" printing code
2011-05-06 22:13:56 +01:00
621279e498
on asset "show digest" command, print out the asset type name (e.g. texture) as well as its number
2011-05-06 22:04:26 +01:00
9ff94a3a44
Say which filename an asset has been dumped to on a successful dump
2011-05-06 21:58:41 +01:00
2ef8e03773
Change command help text for "show capabilities" to "show caps", as this is the actual command that has to be typed on the console.
...
Thanks to makopoppo for the patch - http://opensimulator.org/mantis/view.php?id=5467
2011-05-06 21:21:02 +01:00
7c3e8a106b
Merge branch 'master' of https://github.com/allquixotic/opensim-autobackup
2011-05-06 20:51:55 +01:00
74e981e796
One more bug fix concerning library items that weren't being copied to user's inventory. Also commented verbose debug message.
2011-05-06 09:56:27 -07:00
50c0069f7d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-06 09:09:13 -07:00
eafc01cf8f
Bug fix: iars under Library weren't being loaded.
2011-05-06 09:08:24 -07:00
68bb0f81e2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-05 20:07:19 -04:00
fd44540c02
add descriptive explanations for region restart functionality
2011-05-06 01:06:28 +01:00
e4e95706d5
Add support for llRequestSecureURL() if ssl is enabled
2011-05-05 19:57:10 -04:00
8ca7938753
Adding ssl support
...
Adding ssl support for "Out of Band" applications such as the remote
admin module or Robust services
2011-05-05 19:56:54 -04:00
8755a48cde
fix command display for debugging 'emergency-monitoring'
2011-05-06 00:34:04 +01:00
46baadbb65
remove the NDesk.Options using since didn't end up needing it
2011-05-06 00:22:19 +01:00
bc49a0bc5d
Add "dump asset" command to the asset service for debugging purposes.
...
This command dumps the asset with the given id to a file with the same name.
2011-05-06 00:09:08 +01:00
f5bb6edd85
Squish a warning
2011-05-05 13:01:46 +01:00
e8944d6c31
Test m_Enabled on RemoveRegion.
2011-05-04 20:40:25 -07:00
6d34932775
Merge branch 'master' into caps
2011-05-04 20:30:33 -07:00
6c503e75ac
Put the previous state back in the attachments in case the agent transfer fails.
2011-05-04 12:04:35 -07:00
df7dacd004
Fixes mantis #5461 .
2011-05-04 11:34:18 -07:00
a0f3b23065
Merge branch 'master' into caps
2011-05-04 07:31:32 -07:00
4c59d57596
use getters instead of member variables in velocity network filter code and add some more descriptive comments.
2011-05-04 03:29:06 -07:00
13ab00e45a
adjust terse avatar update filtering to send updates when distance traveled does not match expected distance, rather than at a fixed time period. this should smooth avatar motion somewhat when moving in a straight line and velocity is constant.
2011-05-03 19:47:50 -07:00
98b84802e4
Changed the defaults, so that it behaves exactly is it has been behaving (no WebFetch cap by default).
2011-05-02 20:19:36 -07:00
ac9697edbe
Fixed: EventQueueGet and other caps were being wrongly deregistered. Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
2011-05-02 19:45:47 -07:00
6b52c1d6cd
Fix the GetTexture path to /CAPS/GetTexture for now until we have real capabilities.
2011-05-02 16:16:10 -07:00
883f21dd02
WebFetchInventoryDescendents working. Tested with robust.
2011-05-02 14:33:34 -07:00
2d403d5b18
Merge branch 'master' into caps
2011-05-02 11:56:51 -07:00
aba9ffdbd0
Refactored the GetMesh module into a handler and a module, to be the same as GetTexture.
2011-05-02 11:56:40 -07:00
f7d3720126
Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien avatar takes 6secs to transfer between sims on the same machine...
2011-05-02 09:20:08 -07:00
51d0b8b4e9
Oops, forgot this one.
2011-05-02 09:06:21 -07:00
8cc547c277
Turns out that it's a bad idea to let Agent position updates linger for a long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before.
2011-05-02 09:04:34 -07:00
10180760b7
Works!
2011-05-02 08:48:55 -07:00
0995fedcac
AutoBackupModule: Implement per-region settings in Regions.ini.
2011-05-02 04:32:31 -04:00
fffd42f5cb
Merge git://opensimulator.org/git/opensim
2011-05-02 02:23:18 -04:00
2aab033aaa
First pass at fixing justincc's feedback v2 ( http://opensimulator.org/mantis/view.php?id=5440 )
...
Fixing everything here (I think) except the per-region config. That's next.
2011-05-02 02:20:50 -04:00
2d21052fa3
Start to drill down on GetTexture. Read the config and do different things.
2011-05-01 19:09:08 -07:00
f79400e94c
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
...
Renamed a few methods that were misnomers.
Compiles but doesn't work.
2011-05-01 18:22:53 -07:00
275046cf02
Change GetTextureModule.cs to conform to the new IRegion module interface. NOTHING OF THIS WORKS. Compiles.
2011-05-01 12:03:00 -07:00
126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
f10666c7ba
How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.
2011-05-01 10:07:54 -07:00
8cc9d22b89
Merge branch 'master' into caps
2011-05-01 09:31:26 -07:00
bbe41c75e1
Fixed confusing OSDMap that comes as the response of QueryAccess in the case it fails.
2011-05-01 09:30:23 -07:00
f0bf64b6de
Merge branch 'master' into caps
2011-05-01 09:11:16 -07:00
6b2b036387
Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles.
2011-05-01 09:08:18 -07:00
d4323dd753
Increased Timeout to 30 secs.
2011-04-30 18:08:48 -07:00
91a604d4b6
Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because it was _way_ too low and is probably making writes abort in the middle.
2011-04-30 17:40:21 -07:00
56df746133
XXX DEBUGGING!
2011-04-30 16:53:43 -07:00
00e94b0ba8
Check for RegionID instead of RegionHandle. Other minor tweaks
2011-04-30 16:53:11 -07:00
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
c062138dad
Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all.
2011-04-30 12:23:40 -07:00
3e79842312
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
99b35d3ca6
When coming in from a legacy region without fatpacks, start scripts the
...
usual way
2011-04-30 16:20:20 +01:00
4d5d6222f7
Delaying starting the scripts on TPs and crossings until the agent is root.
2011-04-29 17:09:48 -07:00
412503b216
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-29 15:52:40 -07:00
0d49611f6d
Remove the scripts of the attachments in the departing region and recreate them if fail.
2011-04-29 15:52:06 -07:00
8f14c3f04f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-29 15:49:49 -07:00
d565041e16
Fix crash when [Mesh] section is missing from configuration files
2011-04-29 15:49:10 -07:00
73caa4e94a
Minor correction to yesterday's changes. Make normal prim crossing (no attach) work well again.
2011-04-29 08:42:51 -07:00
e462b926ac
Minor improvement in version checking (Simulation service)
2011-04-29 08:01:44 -07:00
97790075fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 20:47:34 -07:00
9892e115cc
Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
2011-04-28 20:19:54 -07:00
5e578c9755
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 23:43:42 +01:00
cd7517ccb9
Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
...
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
2011-04-28 22:59:12 +01:00
35f190cc92
One less [Serializable] -- ClientInfo.
2011-04-28 09:06:57 -07:00
549dc5aeb9
Eliminated sAgentCircuitData, a data structure that has been obsolete for quite some time.
2011-04-28 08:58:04 -07:00
7ecf689584
Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to speed with 0.7.x.
2011-04-28 07:28:29 -07:00
50aa93137d
Fix a bug where physical objects rezzed with an initial velocity by script do not receive this velocity.
...
This is a minimal fix for the 0.7.1 release, pending a non copy/paste solution.
This hopefully addresses http://opensimulator.org/mantis/view.php?id=5457
The bug was introduced in commit 3ba5eeb
2011-04-28 00:59:21 +01:00
e0576b56d3
Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples.
2011-04-27 07:02:37 -07:00
16f6f55f2d
network traffic reduction - decrease update frequency for moving avatars when velocity is unchanged
2011-04-26 16:22:44 -07:00
1505fbb647
Add back the high prioritization for other avatars in the
...
BestAvatarResponsiveness prioritizer.
2011-04-26 08:54:05 -07:00
587aa91e36
Merge git://opensimulator.org/git/opensim
2011-04-26 11:45:38 -04:00
36fef21e52
Merge branch 'master' into queuetest
2011-04-26 08:42:21 -07:00
c82c7e6ed9
Wait for OnOarFileSaved event callback before executing script
...
We want to execute the (optional) user script after I/O is done on the oar.
I wasn't aware that ArchiveRegion is asynchronous -- now I am.
Should fully resolve comment 0018290 at
http://opensimulator.org/mantis/view.php?id=5440
2011-04-26 11:42:06 -04:00
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
037373b825
recover from unhandled exception from bad rotation data while processing entity updates in LLClientView.cs
2011-04-25 17:11:54 -07:00
b9bca893ef
Removed debug message in the token bucket code
2011-04-25 16:13:16 -07:00
13f141a4d5
Fix the totals shown by show throttle
2011-04-25 15:36:59 -07:00
b7eda288bf
Merge branch 'master' into queuetest
2011-04-25 15:12:53 -07:00
77ab7ce084
Fixed the transmission of throttles from root agent to child
...
agents. Child throttles are based on the number of child agents
known to the root and at least 1/4 of the throttle given to
the root.
2011-04-25 15:11:29 -07:00
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
2fefb7adee
Merge branch 'master' into queuetest
2011-04-25 10:55:19 -07:00
024c12abc3
Cleaned up various configuration options. Removed the category throttle
...
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
3a38bd8854
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
2011-04-25 08:53:48 -07:00
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
e3c3d626fb
Commented verbose debug message.
2011-04-24 16:14:24 -07:00
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
440d54a521
AutoBackup: Removed unneeded imports.
2011-04-23 18:32:08 -04:00
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
e2c6ed236d
Fix a bug looping through the priority queues. This should fix the problem
...
of not all prims being sent without reprioritization.
2011-04-23 12:17:10 -07:00
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
d5256094d9
print invalid command message to the console, not the log
2011-04-23 00:16:55 +01:00
a3bd769cb3
Added a second immediate queue to be used for the BestAvatar policy
...
and currently used for all of an avatars attachments by the other
policies. Also changed the way items are pulled from the update queues
to bias close objects even more.
2011-04-22 14:55:23 -07:00
08e58e7ca6
Set the initial rate for the adaptive throttle to 160Kpbs
...
or about 15 packets per second.
2011-04-22 14:02:34 -07:00
3534f4492a
Various clean ups. Removed some debugging code. Added a new "show pqueues"
...
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
cbe49ed917
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-04-21 19:08:31 -04:00
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
0897647709
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
2011-04-21 15:41:15 -07:00
c5159ad8d0
Add some locking on the child list for the token bucket
...
hiearchy. A few other cosmetic changes.
2011-04-21 15:40:38 -07:00
7f28dd4b31
Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and Removes in that order.
2011-04-21 15:40:32 -07:00
398bb2149a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-04-21 23:04:01 +01:00
13d6e05d5a
Implement agent limits
2011-04-21 23:03:38 +01:00
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
60685c3517
Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes.
2011-04-21 19:17:38 +01:00
e36cab99fd
minor: small amount of method doc and some commented out odds and ends
2011-04-21 18:45:05 +01:00
44999dce76
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 18:44:04 +01:00
63c1b7e475
Alter uuid gather so that it properly analyzes coalesced objects.
...
This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
2011-04-21 18:12:29 +01:00
371576d1dd
Merge branch 'master' into queuetest
2011-04-21 08:23:01 -07:00
3640d0204f
Added ability to remove unacked packet from UnackedPacketCollection without an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case.
2011-04-21 01:51:08 -07:00
b5ab33b5e1
bug fix. Now when an unacked update packet is handled through ResendPrimUpdates, it is removed from the UnackedPacketCollection.
2011-04-20 23:08:51 -07:00
7759bda833
Added an "immediate" queue to the priority queue. This is
...
per Melanie's very good suggestion. The immediate queue is
serviced completely before all others, making it a very good
place to put avatar updates & attachments.
Moved the priority queue out of the LLUDP directory and
into the framework. It is now a fairly general utility.
2011-04-20 21:58:49 -07:00
2b737c9cc2
Adds the first pass at an adaptive throttle to slow start new
...
clients. If the sent packets are ack'ed successfully the throttle
will open quickly up to the maximum specified by the client and/or
the sims client throttle.
This still needs a lot of adjustment to get the rates correct.
2011-04-20 16:23:33 -07:00
212326eeb0
fix meshing failure on sculpt maps smaller than 64x64
2011-04-19 22:16:10 -07:00
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
2fa210243b
Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages.
2011-04-19 21:54:26 +01:00
82de87ce99
Converted the property request queue to use the same retransmission
...
mechanism as the entity update queues.
2011-04-19 11:22:04 -07:00
08d8a3e580
Requeue unacknowledged entity updates rather than resend then "as is".
...
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.
Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-19 08:10:01 -07:00
36c4e94ef7
Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
...
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
2011-04-18 23:22:04 +01:00
f5a041d012
bump default IAR version to 0.2 and 1.1 for the --profile version.
...
There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
2011-04-18 23:00:41 +01:00
6109605038
bump oar version number to 0.6.
...
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18 22:42:36 +01:00
6600aa2baf
Add regression test to check that OARs start with the control file.
2011-04-18 22:35:33 +01:00
e00e518692
add test to ensure that an IAR starts with the control file
2011-04-18 22:24:42 +01:00
61619ddefc
refactor: split out the code which actually copies a particular bundle to inventory
2011-04-18 21:59:01 +01:00
71114d4ad1
refactor: rename DeleteToInventory() to CopyToInventory()
...
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
2011-04-18 21:34:26 +01:00
5a404a9ab1
Fix bug where objects were being coalesced in the wrong positions.
...
This addresses http://opensimulator.org/mantis/view.php?id=5441
The bug was due to a pre-existing mistake in creating the inventory stored position
2011-04-18 21:07:11 +01:00
8533c63d89
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-18 20:36:26 +01:00
419fc9427e
Provide a configuration setting to control whether multiple taken objects are coalesced to inventory
...
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
2011-04-18 20:03:53 +01:00
452ae375f0
Merge branch 'master' into test-merge0418
2011-04-18 11:29:43 -07:00
03e725ad87
Mantis #5442 : Add admin_save_heightmap
2011-04-17 21:43:16 +01:00
70084c5e3a
More descriptive debug msg for ServiceOSDRequest failures.
2011-04-16 15:29:28 -07:00
3e0e1057ac
Remove the call to remove tokens from the parent. Under heavy load
...
this appears to cause problems with the system timer resolution.
This caused a problem with tokens going into the root throttle as
bursts leading to some starvation.
Also changed EnqueueOutgoing to always queue a packet if there
are already packets in the queue. Ensures consistent ordering
of packet sends.
2011-04-15 16:44:53 -07:00
cd6dce1108
Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't).
2011-04-15 16:42:40 -07:00
ed74be6599
Make remote admin error messages more helpful on windows.
...
Also, make log messages conform more with convention.
2011-04-15 23:54:30 +01:00
1dba671f45
refactor: separate out code that adds permissions
2011-04-15 23:32:46 +01:00
065d3f42c7
Merge branch 'master' of /home/opensim/lib/develop/BlueWall
2011-04-15 18:28:46 -04:00
fc365f2a31
Thanks Snoopy for a patch that allows setting of perms on items given to new avatars
2011-04-15 18:23:37 -04:00
9c7f14bf36
minor: remove a small amount of code duplication
2011-04-15 23:07:23 +01:00
98c5ed2c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-15 22:49:59 +01:00
52d9230392
refactor: split out some rez code into a separate CreateItemForObject() method
2011-04-15 22:47:47 +01:00
37d2b6243b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 21:16:30 -04:00
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
631654a38d
remove old code for a mock grid service, which got removed some time back
2011-04-15 01:30:49 +01:00
ba73df39a3
remove any reference to a mock authentication service since it doesn't exist and we don't use it
2011-04-15 01:26:07 +01:00
54e8855819
remove mock asset service for tests in favour of always using the real one
2011-04-15 01:23:26 +01:00
79bd430e08
Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin
2011-04-15 01:10:26 +01:00
ad70cddcfc
extend TestLoadCoalesecedItem() to check loaded object ids and positions
2011-04-15 00:56:40 +01:00
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
55387542ea
simplify InventoryArchiveTestCase setup
2011-04-14 20:35:00 +01:00
1569148b49
simplify TestSaveItemToIarV0_1()
2011-04-14 20:32:27 +01:00
e439264824
simplify TestRezObject()
2011-04-14 20:23:48 +01:00
c644ab6a2c
Make scene object parts created by the test utils unit sized.
2011-04-14 20:21:44 +01:00
4b05e667cb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 20:15:34 +01:00
22b307ea1c
Merge branch 'master' into queuetest
2011-04-14 11:59:25 -07:00
aaf9125869
simplify coalesced object tests by using existing scene object set up utils
...
this change makes it possible to set an absolute position on a group before it is put into a scene.
2011-04-14 17:33:55 +01:00
6ed6b46aad
Comment out the warning if the prioritizer runs without a fully
...
initialized scene presence. Not sure why we are dumping updates
to a client that isn't there yet...
2011-04-13 21:01:51 -07:00
590d20903c
Merge branch 'testmerge' into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
2011-04-13 15:41:17 -07:00
bf91d1b077
remove packet monitoring debugging code
2011-04-13 15:37:25 -07:00
b33aac737a
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-13 15:37:25 -07:00
5e7aba4f88
fixed a couple bugs with the property queues
2011-04-13 15:37:25 -07:00
3fe22126ca
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-13 15:37:25 -07:00
5b89c66c97
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-13 15:37:25 -07:00
c5465414b6
Use common coalesced serialization code for both tests and the InventoryAccessModule.
...
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
2011-04-13 22:55:26 +01:00
c81f5bfc5c
Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers.
...
Extend test to check position of objects in the rezzed coalescence.
2011-04-13 22:29:12 +01:00
c0fcc430fe
Merge branch 'master' of /home/git/repo/OpenSim into queuetest
2011-04-13 17:03:30 -04:00
68cc5b46fe
refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.
2011-04-13 21:48:16 +01:00
d8d28c3737
Fix bug where rezzing coalesced objects would give all objects the same name as the item.
...
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
2011-04-13 21:31:45 +01:00
58efd761d1
Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
...
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
2011-04-13 21:17:43 +01:00
dec9c2283b
Add ColladaMesh switch
2011-04-13 16:10:18 -04:00
08fd1d9bbd
factor out some test code into the SetUp()
2011-04-13 18:11:04 +01:00
6613daa82a
Add a regression test for rezzing a single object into a scene from user inventory
2011-04-13 17:46:36 +01:00
90b810c27e
force mesh proxy for simple box prims with path cut
2011-04-12 22:47:30 -07:00
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
16c911dcbb
Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png.
2011-04-12 19:46:27 -07:00
5c870fce54
Bug fix in object serialization -- sculpt data was wrong.
2011-04-12 19:45:33 -07:00
317617cfda
remove packet monitoring debugging code
2011-04-12 15:55:21 -07:00
80ba3de902
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-12 15:40:57 -07:00
7fa085b3fa
fixed a couple bugs with the property queues
2011-04-12 14:40:57 -07:00
da4a9653a2
minor: remove some mono compiler warnings
2011-04-12 22:33:06 +01:00
b0889ed92a
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
2011-04-12 22:30:43 +01:00
8e0d2cc43b
If an object is rezzed directly from a prim inventory then give it the rotation it was stored with.
2011-04-12 22:21:46 +01:00
3ba5eeb6c3
Allow a null rotation to be passed in to RezObject so that we can control whether to use the serialized rotation or not. Not used yet.
2011-04-12 22:15:40 +01:00
3afddb9033
Merge branch 'test-select' into queuetest
2011-04-12 12:39:02 -07:00
0e97629ee7
Merge branch 'master' into queuetest
2011-04-12 12:38:47 -07:00
095e602c4a
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-12 12:36:36 -07:00
98d7de22dc
Fix (add) ability to rez objects by dragging them out of another prim's inventory.
...
This should happen if the client supplies a task ID with the RezObject call.
The rez goes through the same code as llRezObject(), so the same perms are applied.
Rotation isn't yet preserved, this should be fixed shortly.
2011-04-12 18:31:41 +01:00
049bce4d00
Fixup the global defaults config parsing code.
2011-04-12 01:14:21 -04:00
621d5b58e1
minor: add a bit more method doc to IInventoryService.GetItem()
2011-04-11 23:56:04 +01:00
49d80f5711
Include code to return more information about the NullReferenceException seen in
...
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
2011-04-11 23:07:56 +01:00
64dc7e9f14
minor: remove now inaccurate comment
2011-04-11 22:35:07 +01:00
e8ecb2898c
minor: remove some mono compiler warnings
2011-04-11 22:33:24 +01:00
3a98fb080a
minor: adjust some spacing and indentation
2011-04-11 22:29:08 +01:00
464fa45ec9
Implimented HTTP_VERIFY_CERT for llHttpRequest
2011-04-11 22:22:11 +01:00
0bd6bc8fba
create "config show" as a region console command synonym for "config get".
...
This is to create greater consistency with all the other show commands.
2011-04-11 21:59:26 +01:00
d6948b15c4
Make it more obvious when it happens that DLL plugin loading fails. Improve exception output on Windows.
2011-04-11 21:51:17 +01:00
95a6ee0a37
Fix NREs harder.
2011-04-11 13:20:46 -04:00
4ad05fb01d
Fix some NREs on certain paths.
2011-04-11 13:12:26 -04:00
4974a1ce69
AutoBackup: Support region-independent settings too.
2011-04-11 12:34:26 -04:00
6e9cdb9ce3
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-11 09:06:28 -07:00
72a24cf023
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/Prioritizer.cs
2011-04-11 08:41:36 -07:00
f778056c7a
Removed some priority queue debugging code
2011-04-11 08:37:43 -07:00
ebc249e3be
Changed the "not in scene" check in the prioritizier to just
...
a warning. There appears to be a race condition on slow logins
that attempts to prioritize before the scene presence is fully
initialized.
2011-04-10 17:02:40 -07:00
19c6d1d569
Split the priority queue class into a seperate file. LLClientView
...
is big enough.
2011-04-10 16:57:02 -07:00
83dc2470f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-10 16:57:02 -07:00
0bd06d8ba8
Fixed the prioritizer functions for the new priority queues
2011-04-10 16:57:02 -07:00
77cf9405de
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-10 16:57:02 -07:00
9c0f3c73b1
Merge git://opensimulator.org/git/opensim
2011-04-10 18:28:54 -04:00
707b6673c9
minor: remove mono compiler warnings
2011-04-09 00:25:00 +01:00
abea0c74c2
Add support for the new display name related functions in LSL. This does not
...
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
2011-04-08 04:19:17 +01:00
d31175060f
trivial whitespace removal to trigger a panda rebuild
2011-04-08 00:42:35 +01:00
0ced677510
Revert master version number to 0.7.1 for now to make merging easier.
2011-04-07 23:22:19 +01:00
9d40c0dcc7
Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X.
...
The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
2011-04-07 23:20:04 +01:00
a6b1927cff
bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch now exists.
2011-04-06 22:05:07 +01:00
9bc2705f37
Fix bug where on duplication, the root part local id was continually used in populating the local id scene object index instead of each part's local id
2011-04-06 20:52:36 +01:00
8318915d7e
Signal prim count taint if the AbsolutePosition of a scene object changes.
...
This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules)
Create TestMoveOwnerObject() regression test for this case.
2011-04-06 20:48:00 +01:00
63533412f8
Improve previous ILandObject method doc.
...
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
2011-04-06 18:57:50 +01:00
fa202a05e9
Add method doc to some land bitmap methods in ILandObject.
...
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
2011-04-06 17:19:31 +01:00
2497962360
Change some text to make the autoreturn mechanism more obvious, and align with the fact that it's one word rather than two.
2011-04-05 22:25:00 +01:00
acacee98c6
properly refresh object owner list when refresh button is hit on land parcel object tab
2011-04-05 22:15:06 +01:00
0e465da187
remove now unused individual LandData prim counts.
...
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
2011-04-05 21:25:54 +01:00
f030ba8992
replace magic numbers in llGetParcelPrimCount() with constants
2011-04-05 20:39:58 +01:00
dc6ce24443
switch llGetParcelPrimCount() to use new prim counts module
2011-04-05 20:31:52 +01:00
3d400fc663
If an object is selected, then don't include it in owner/group/others prim counts.
...
This fixes the total prim count that the viewer displays when prims are selected - it appears to ignore the total that we pass it and adds up the counts separately.
2011-04-05 18:24:23 +01:00
c1dec225ab
Handle the client's parcel info requests asynchronously rather than synchronously.
...
Handling these synchronously kills the inbound packet loop if many requests are made for remote land and those requests are handled slowly or timeout (timeout is 10s)
This can happen if a user searches for "land for sale" and then clicks many of the parcels in the list (or just presses down arrow to move through every entry).
2011-04-05 17:47:11 +01:00
18e206d2ed
* Bugfix - Compile NullEstateData implement public List<int> IEstateDataStore.GetEstatesByOwner(UUID)
2011-04-04 23:45:28 -04:00
d5e0674213
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-04 20:04:01 -07:00
b2fbadeae8
Updates NullStorage plugin.
...
Thanks MisterBlue...
2011-04-04 20:02:13 -07:00
f58941e89f
Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns).
...
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
2011-04-05 01:30:13 +01:00
8b134f37f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-04 14:18:26 -07:00
15c4bbea59
Fixed the prioritizer functions for the new priority queues
2011-04-04 13:19:45 -07:00
6885b7220c
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-04 11:41:07 -07:00
adb14ad20a
Implement rezzing coalesced objects
2011-04-03 20:32:04 +01:00
a4b3439025
Implement rezzing coalesced objects
2011-04-03 20:26:18 +01:00
b385d4aa03
Implement taking of coalesced objects.
...
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
2011-04-03 20:24:44 +01:00
e8e940e33e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 14:16:41 +01:00
4f56c732bc
Comment out some startup logging lines to make up for the one I added earlier on.
...
Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
2011-04-02 02:29:42 +01:00
7bba0177fe
If land is not group owned (group ID is always UUID.Zero) then don't check if a prim should be added to the group count
2011-04-02 01:53:47 +01:00
8e668abc6d
add test for removing group owned objects
2011-04-02 01:46:06 +01:00
01b399055b
add test for adding group object, factor out initial zero counts test
2011-04-02 01:37:46 +01:00
c13502a5cf
add remove others object prim count test
2011-04-02 01:15:17 +01:00
2c86f6ba7d
refactor: rename m_dummyUserId to m_otherUserId
2011-04-02 01:13:10 +01:00
5b0936d4b5
If the land has no group ownership (it is UUID.Zero) then don't put prims in the group count when they are also not group owned.
...
Also adds simple test for others owned count when an object is added
2011-04-02 01:07:52 +01:00
3a113f9902
A stab at making CHANGED_OWNER work
2011-04-01 22:04:29 +01:00
e974fde953
check threat configuration for LSL print()
2011-03-31 22:56:04 -07:00
8c8a0a182e
implement LSL "print()" API function
2011-03-31 21:14:53 -07:00
8f4bf43534
When asked to join region to existing estate, make first estate name the default instead of None
2011-04-01 00:55:05 +01:00
e1ceb461c0
Make default answer for 'do you wish to join region to an existing estate' yes instead of no.
2011-04-01 00:51:10 +01:00
39c610c165
Log which address and port the UDP listener is configured for. This will match that given for InternalAddress in the config (e.g. 0.0.0.0)
...
Can't obtain actually bound address until the UDP socket is used for the first time.
2011-04-01 00:41:52 +01:00
4d0cffa06e
If the prim count gets an object with invalid bounds, don't try to count it.
...
This appears to be the more probable explanation for some failures seen. Either we're counting attachments which are temporarily out of bounds (shouldn't be due to the IsAttachment) check or we're counting scene objects which have out of bounds co-ordinates (seems more likely)
2011-03-31 23:56:26 +01:00
6ae76ede98
suspend check that IAR control file is loaded for now
...
I was mistaken - some previous opensim versions don't save this file first. Will have to bump iar version number and only check iars after the bump
2011-03-31 23:09:06 +01:00
88bd38690a
Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.InternalEndPoint.Port
2011-03-31 23:03:42 +01:00
efd0c003a3
Put in temporary logging message to find out if scene objects are requesting land objects for co-ordinates outside the region
2011-03-31 22:47:18 +01:00
7bba31e8d9
remove some mono compiler warnings
2011-03-31 22:20:12 +01:00
8022400bd4
Remove unused Datastore parameter from RegionInfo (legacy from early 2008)
2011-03-31 22:16:09 +01:00
f7ed7fc05d
When a new parcel is created, make sure the prim counts are updated.
...
This is done by tainting the counts where appropriate
2011-03-30 00:42:02 +01:00
8b16f7d976
(re)implement selected prim count.
...
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
2011-03-30 00:13:07 +01:00
f754dedbef
Merge branch 'primcounts'
2011-03-29 23:08:44 +01:00
fe258753a0
disable prim count debug logging temporarily
2011-03-29 23:07:01 +01:00
309eb712a3
Improvement over 2 commits ago: make the hyperlink check understand port 80.
2011-03-28 19:34:55 -07:00
d3771e5366
Added code to load a terrain tile of tiff/jpg format. Previously it only worked for one single region.
2011-03-28 16:48:12 -07:00
2d209d3844
Fix mantis #5413 . WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
2011-03-28 16:46:04 -07:00
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
797128a6ad
Rename some member fields to standard m_ OpenSim code convention
2011-03-26 02:44:46 +00:00
83f48c26d6
add header file
2011-03-26 02:43:41 +00:00
de0730a54c
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
2011-03-26 02:42:50 +00:00
361b3e7ab8
Removing hard-coded plugin loading in favour of direct class instantiation
2011-03-26 02:39:30 +00:00
3f4be42a87
Altering log feedback
2011-03-26 02:28:11 +00:00
e93531e124
Fixing bug that occurs when using web login- the result was not checked
2011-03-26 02:28:11 +00:00
3bc859a834
Making combined auth service re-use the existing auth services instead of duplicating code
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
0e808950fb
InfoFormat > DebugFormat
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
6153c45973
LLLoginHandlers now supports both password & web login
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
af3956348f
Adding a combined auth service, allowing users to login with either web login or password
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
482686daab
WebkeyAuthenticationService is now no longer a stub!
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
f2d2470c25
When an object is duplicated, add it to the full/local id SOG indexes as well as Entities
2011-03-26 02:24:32 +00:00
b11e3d33f1
add save of LLClientView I forgot from last commit
2011-03-26 02:20:16 +00:00
541cd3e8c8
move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView
...
need to move selected prim counts from LandData/LMM still
2011-03-26 02:19:28 +00:00
bfd9cc44b4
When an object is duplicated, add the dupe to the uuid/local id indexes as well as the basic entities list.
...
Added a prim counts test to reinforce this - shift-copy was no incrementing prim count. This will sometime become a basic scene test.
New code needs to be refactored so we just call SceneGraph.AddSceneObject(). This will happen in the near future.
With this, basic owner prim counts on a single parcel appear to be working fine (with the same previous existing taint calls as used by the land management module).
More work to do.
2011-03-26 02:05:53 +00:00
3d0e072d50
Merge branch 'master' into primcounts
2011-03-26 00:57:52 +00:00
26d16567e1
Make SceneGraph.ForEachSOG() execute once for each SOG, not once for each prim (e.g. a SOG with 3 prims would have the action executed three times).
...
To do this, a new SceneObjectGroupsByFullID index in SceneGraph which just index's prims by their root part UUID, in order to avoid the inefficiency of filtering existing lists.
Existing callers to SceneGraph.ForEachSOG() did not fail due to the multiple per SOG action executions - they were probably just much less efficient.
Code suggests that no callers expected ForEachSOG() to execute actions on sog multiple times
2011-03-26 00:53:19 +00:00
f30bf429c2
refactor: rename SOG collections in SceneGraph to make it clearer that they are indexing each part's UUID, not just the root part.
2011-03-26 00:42:48 +00:00
cc8897fceb
Add test for PCM taint. This currently fails due to unexpected behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
...
Also adds lots of temproarily debug logging
2011-03-26 00:34:49 +00:00
d8e1c380e6
minor: make it clearer in the log where we're loading region config files and not the regions themselves
2011-03-25 23:36:58 +00:00
3a55d59b45
in region web loader, print out url that config is being loaded from (this wasn't being done anywhere).
2011-03-25 23:29:06 +00:00
ea72745d43
Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
...
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +00:00
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
...
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +00:00
7f5019b0f2
Add ILandObject.IPrimCounts for the new prim count module.
...
Not functional yet, but tests now act against this object rather than interrogating the module directly
2011-03-25 21:47:54 +00:00
eaa37d15f2
factor out common test setup code in PCM tests
2011-03-23 23:28:23 +00:00
f001aab8aa
extend TestAddOwnerObject() to add a second object
2011-03-23 23:19:15 +00:00
ebbe3afaf1
Add PrimCountModuleTests.TestRemoveOwnerObject().
...
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
2011-03-23 23:14:55 +00:00
d5c7ae5c6b
refactor common sop setup parts into a single method
2011-03-23 22:40:23 +00:00
de88227bc4
refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject()
2011-03-23 22:29:27 +00:00
88673c86a4
use a 3 part object for the pcm test rather than a 1 part, for improved test coverage
2011-03-23 22:17:47 +00:00
f1f4985ab6
user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero
2011-03-23 22:14:04 +00:00
654aa7abeb
Extend simple PCM add object test to check all counts
2011-03-23 22:12:20 +00:00
08c3cd6b36
Add method doc to the Get*() methods on PrimCountModule
2011-03-23 22:04:14 +00:00
67cafbd33a
remove a rogue Console.WriteLine() from the last commit.
2011-03-23 21:54:02 +00:00
d011896341
Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to listen for that rather than EventManager.OnParcelPrimCountAdd
...
OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count.
Extend automated test for this scenario.
2011-03-23 21:53:14 +00:00
b34743e5fe
Add an initial confidence-building TestAddObject() for prim counts.
2011-03-22 23:47:36 +00:00
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
2011-03-21 23:26:35 +00:00
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
2011-03-21 23:16:57 +00:00
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
2011-03-21 22:57:20 +00:00
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
2011-03-21 22:47:02 +00:00
2d1f0d224c
minor: slightly adjust previous method doc.
2011-03-21 22:27:16 +00:00
793bfb5a66
add method doc to IEstateDataService and IEstateDataStore interfaces
2011-03-21 22:25:20 +00:00
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
fb890e543f
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 08:02:56 +00:00
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
fdcf910e00
Fix a bug in T015_LargeSceneObjects() where the large scene object was stored 31 times (1 time for each added part) instead of once at the end, even though only the largest 31 prim scene object was retrieved and tested.
...
This considerably speeds up the test, when on sqlite it now only takes 2 seconds rather than 30+
2011-03-14 23:35:03 +00:00
38c3be07b8
when retrieving a sog in database tests, don't bother adding the scene since this isn't used
2011-03-14 23:32:44 +00:00
8509678e48
Add method doc to T015_LargeSceneObjects() and slightly clean up formatting.
...
This test takes a considerable time on SQLite but should remain since it's testing storage and retrieval of a scene object with 31 parts.
2011-03-14 23:26:50 +00:00
48c62eb51b
Add current method output to all persistence level tests so that we can track where we are in the test suite
2011-03-14 23:17:15 +00:00
9885f68f44
When setting media on a prim values, use generic object permissions instead of media permissions.
...
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate. It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
2011-03-14 22:47:14 +00:00
2868f3fc72
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-14 21:56:58 +00:00
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
f6f8d124d1
minor: remove mono compiler warning
2011-03-12 00:52:43 +00:00
f6b638fec9
factor inventory file loading into its own method
2011-03-12 00:49:13 +00:00
c4060e56ef
factor out iar asset load code into its own method
2011-03-12 00:35:40 +00:00
a3c7c04ead
refactor: make boolean load indicators on load iars instance fields
2011-03-12 00:28:23 +00:00
367ed585e0
introduce iar load checks which make sure archive.xml comes first, then inventory nodes, then assets
...
this is necessary for correct loading. "save iar" always saves in this order so there shouldn't be any problems - these checks are to give better feedback to other systems that may construct IARs.
2011-03-12 00:21:52 +00:00
836ab6b0e8
Change how map blocks are encoded to make map search
...
work with viewer 2.
2011-03-10 15:23:46 -08:00
ad1dea5aff
Add test for simple case where creator account with appropriate uuid exists on the target system for an iar load
2011-03-10 22:56:11 +00:00
8d69e68311
refactor: rename test user account fields
2011-03-10 22:52:41 +00:00
9ecb745ed7
factor out common scene setup code in InventoryArchiveTestCase
2011-03-10 22:48:19 +00:00
66d2d35425
extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as well
2011-03-10 22:40:24 +00:00
ce4421497e
re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()
2011-03-10 22:38:52 +00:00
b821f748ac
For objects loaded from an IAR, make sure the CreatorID points towards the OSP resolved ID if newer CreationData is not present.
...
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
2011-03-10 21:56:15 +00:00
db2ad62c9b
in AssetHelpers.CreateAsset(), create objects using the 'original' xml format rather than 'xml2'
2011-03-10 19:52:19 +00:00
a151afebe3
When setting up default iar for testing, use iar archiving code rather than constructing the tar manually
2011-03-10 19:40:19 +00:00
4dd60b7dce
Change existing users load iar test so that it fulfills it's original intention (i.e. OSPA resolution, which is still active).
...
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
2011-03-10 00:19:17 +00:00
549b0ea17c
Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into a new test TestLoadIarToInventoryPaths()
2011-03-10 00:06:32 +00:00
fa1996155e
Make the item created in the default test iar an object rather than a script
2011-03-09 23:58:26 +00:00
07f68c8318
minor: change the order of some default iar setup in test case
2011-03-09 23:54:52 +00:00
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
20aeace8d7
Add log messages on teleport failure to better pin down the cause.
2011-03-09 22:03:12 +00:00
ae507bb060
Split out path tests from InventoryArchiveTests. Factor common code into test case parent
2011-03-09 01:53:27 +00:00
2fa8fc5052
remove inventory service preserving code from SceneSetupHelpers too
2011-03-09 01:37:31 +00:00
f375a5e9cb
Simplify SceneSetupHelpers class by removing all code which was originally preserving service instances between tests. This wasn't being used anyway and just leads to hard to diagnose test failures.
2011-03-09 01:31:47 +00:00
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
743a6b0da5
Make -m shortcut option for --merge on load iar specific. Correct some log message origins.
2011-03-08 22:44:02 +00:00
9923a2ff10
Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever.
2011-03-08 09:02:29 -08:00
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
2e46027c14
Construct test load iar only once and reuse for each test, rather than recreating it every time
2011-03-05 02:34:44 +00:00
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
12d5a20094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-04 17:18:49 -08:00
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
72cb498fd0
minor: Make MoapModule namespace consistent with other modules
2011-03-05 01:13:59 +00:00
481ca910da
add test for MoapModule.SetMediaUrl()
2011-03-05 01:07:05 +00:00
3c89527b22
Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
...
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script. This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
b82b0b1677
Normalizing comparison to lower case, just in case ppl set their config vars inconsistently. (maybe related to mantis #5386 )
2011-03-01 09:20:50 -08:00
60989521a6
Merge git://opensimulator.org/git/opensim
2011-02-28 15:08:35 -05:00
b3c42e952f
Fix small bug with remove region; update settings docs.
...
Our impl of IRegionModuleBase.RemoveRegion didn't remove the scene from the states map.
2011-02-28 11:54:07 -05:00
018645f9f8
First pass at busy heuristics. Compile-tested only.
2011-02-28 11:45:50 -05:00
a01c44e74d
Be smarter about stopping timers. Cleanup formatting.
...
Use a boolean flag to tell timers that fire after IRegionModuleBase.Close() is called that they should not execute.
Also, I used MonoDevelop's auto-formatting feature to format the code uniformly. No guarantee about variable names though.
2011-02-28 11:04:54 -05:00
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
34b6904939
First working commit of AutoBackupModule.
...
It seems to do something! Heuristics are still TODO, but this is alpha 1.
2011-02-26 22:09:19 -05:00
d3511ca592
Start the timer. (Could it be that simple?)
2011-02-25 09:03:11 -05:00
cb049aa15f
s/True/true
2011-02-25 08:58:42 -05:00
bb1f03abc6
Make timer auto-respawn.
2011-02-25 08:57:48 -05:00
7fa8ed0c47
Config works, but timer isn't firing. Hmm.
2011-02-25 08:48:02 -05:00
2da9bb3ca2
Try to fix config one more time.
...
Note that the way we specify settings has changed significantly here.
2011-02-25 08:31:10 -05:00
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00
0f545abfc1
Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values
2011-02-25 01:31:38 +00:00
939c47ac52
instead of using different default memory expiration depending on whether there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time
...
this simplifies the code
2011-02-25 01:25:38 +00:00
beff0ac32f
log actual cache directory for FlotsamAssetCache instead of always logging the default
2011-02-25 01:18:43 +00:00
197cc3883f
Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
...
There is probably an underlying bug to fix in ExpiringCache.
2011-02-25 01:16:47 +00:00
2f5394e70d
Fix bug where avatars in other regions would not always show up on the mini-map
2011-02-24 22:33:54 +00:00
db7c758b7f
On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows
2011-02-24 00:55:50 +00:00
1bb0bae78a
Forces the owner of a rezzed object to be the "rezzer" of the
...
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
2011-02-22 13:30:38 -08:00
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
af22b7cb1a
GetRegion(s)ByName with SQLite behaves like it does with other databases.
...
The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
2011-02-22 13:00:45 +01:00
c2658c2f14
More relevant console messages, and maybe fix config problem
2011-02-19 23:14:43 -05:00
7eac0af559
Fix an actual bug in the timer interval calculation (minutes -> msec)
2011-02-19 23:07:54 -05:00
e5c08a553c
More debug messages
2011-02-19 22:55:32 -05:00
3c9bf5c476
Fix config source stuff harder (debug console prints only; no fix yet)
2011-02-19 22:47:05 -05:00
06a4810d21
Fix config source by taking it from Initialize
2011-02-19 22:29:45 -05:00
99e8260282
Add [Modules] option for unconditionally disabling entire module globally (for easy configuration)
2011-02-19 22:08:19 -05:00
dfa63ff031
Let GetNextFile do all the string-building work for SEQUENTIAL.
2011-02-19 20:15:38 -05:00
85654f82a5
First cut of AutoBackupModule; only compile-tested so far
2011-02-19 12:25:04 -05:00
9e47018cfb
Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway
...
This test was non-viable. Keeping inactive T021_TestCrossToNewRegion() around for now since it's still useful for reference purposes in constructing a future working test.
2011-02-19 00:14:13 +00:00
b3a1d8c7f7
Remove unused SceneSetupHelpers.DeleteObjectAsync().
...
Calling async code in automated tests is never a good idea - things become very fragile very quickly
2011-02-19 00:11:08 +00:00
9d668b09ca
remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere
2011-02-19 00:07:16 +00:00
60fe3d48ee
Put some CapabilitiesModule null checks in Scene
...
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
8249d77991
If GridService.GetNeighbours() could not find the region then log a warning rather than causing a null reference on the normal log line
...
This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable
2011-02-18 23:25:59 +00:00
5c92f62941
minor: remove mono compiler warning
2011-02-18 23:10:46 +00:00
dd9efc1838
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
2011-02-18 23:05:56 +00:00
eb699df5f6
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
...
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
2011-02-18 22:49:19 +00:00
023f953f39
remove another unused test teardown method
2011-02-18 22:25:45 +00:00
c155f57dbe
remove unused test teardown method
2011-02-18 22:22:51 +00:00
c763edf56d
separate attachment tests out into their own class
2011-02-18 22:20:08 +00:00
60d47836ce
minor: remove mono compiler warning
2011-02-18 22:00:52 +00:00
88da253c94
Add very basic test which invokes the scene update loop once and checks the frame number.
...
This makes Scene.Update() match its original description of performing a single update, which also matches the semantics of SOG and ScenePresence.
2011-02-18 21:54:44 +00:00
e774679f62
minor: add method doc to a few ScenePresence methods
2011-02-18 21:19:16 +00:00
4725221435
Stop the avatar sometimes pausing for more than a second on the border when region crossing.
...
This restores a RemoveFromPhysicalScene() call in ScenePresence.CheckForBorderCrossing() when the agent has been placed in transit.
If we don't remove the agent from the physical scene, then the method continues to be called via ScenePresence.Update()
until the handover of the client between regions is completed. Since this handover can take more than 1000ms (due to the 1000ms
event queue polling response from the server), this results in the avatar pausing on the border for the entire handover period.
2011-02-18 20:54:00 +00:00
4f9c3c73ad
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
2011-02-17 13:47:13 +01:00
47a5d8d742
Make osTeleportOwner work in foreign regions by relaxing the restrictions on teleporting an agent.
2011-02-17 13:47:12 +01:00
dd4a503a22
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-16 09:57:43 -08:00
c6f2d66eae
Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it.
...
Also in this commit: comment out irrelevant debug message on AuthService.
2011-02-16 09:57:12 -08:00
25265c964f
Changed console command "alert" and added new command "alert-user".
...
This addresses Mantis #4709 .
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
2011-02-16 18:36:57 +01:00
5c15c5e0ff
Changed default directory for storing map tile images from remote regions.
2011-02-16 18:36:40 +01:00
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
918c12c965
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 08:06:11 +00:00
c75e916ccf
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 07:42:53 -08:00
19d3792278
Fix and simplify QBasedComparer.
...
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
c169a62f55
Typo
2011-02-12 18:05:25 -08:00
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
9801bf03f8
minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects.
2011-02-12 01:14:12 +00:00
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
7e21c1eadf
Hack in a crude temporary "estate show" command
...
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00:00
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
754c244f46
In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
...
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
2011-02-10 06:09:04 -08:00
21715396fa
Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues.
2011-02-09 17:45:19 -08:00
f33e51e2ff
Comment instrumentation out. Not needed anymore. Left in comments, in case it is needed again. Mantis #5365
2011-02-09 09:50:26 -08:00
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
2011-02-09 08:35:36 -08:00
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
2011-02-09 08:35:21 -08:00
477a869fb2
More detection of negatives.
2011-02-09 08:08:57 -08:00
473fac4dc7
Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles.
2011-02-09 08:06:20 -08:00
ba202ea9b0
Don't build strings unless we're in emergency debugging.
2011-02-08 21:09:10 -08:00
585473aade
Brute-force debug -- mantis #5365
2011-02-08 20:12:33 -08:00
117462cba1
Avoid potential race conditions on UseCircuitCode. I artificially made the race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back.
2011-02-08 17:53:01 -08:00
f431bd20ec
Minor addition to the previous commit
2011-02-08 14:49:50 -08:00
82846afe4b
Minor improvement to previous commit.
2011-02-08 12:37:37 -08:00
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
34bd41d186
Comment previous debug
2011-02-08 11:16:38 -08:00
305c755cfb
XFF header again -- debug.
2011-02-08 07:50:01 -08:00
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
ebeef02fef
Hunting down mantis #5365
...
Revert "refactor: remove redundant null checks"
This reverts commit 6e58996b4d
2011-02-07 07:45:03 -08:00
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
3411d4867d
Honor check of m_Enabled in WorldViewModule.
2011-02-05 19:40:55 -08:00
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
30fa5ad1e2
One more diagnosis command:
...
show caps
2011-02-05 19:21:12 -08:00
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
3a2a48a8ca
Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future.
2011-02-05 08:20:13 -08:00
67555994ad
Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.
2011-02-05 07:55:54 -08:00
f78831ec98
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-02-05 04:25:14 +00:00
4e0b0f0f4c
Fix a typo in the QUERYACCESS method name
2011-02-05 04:24:43 +00:00
632babf8fb
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
2011-02-04 19:19:38 -08:00
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
2011-02-04 17:05:45 -08:00
cdd64bb8f5
For now, reinstate the call to World.GridService.GetRegionsByName() commented out in 933f47e
...
Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
2011-02-05 00:15:25 +00:00
1ffd70cef7
minor: remove some mono compiler warnings
2011-02-04 23:20:10 +00:00
5b7a5a5b8b
Add position to IM sent from llInstantMessage(), to better fulfill client expectations
2011-02-04 23:14:21 +00:00
a51005aacd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 23:08:27 +00:00
722f0ba18c
Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this).
...
We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value.
This resolves http://opensimulator.org/mantis/view.php?id=5356
2011-02-04 23:07:47 +00:00
bb69a40fbb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 14:22:17 -08:00
7a6e1fa4cf
Convert SimianMaptile refresh time from ms to seconds. Too many 0's
...
in the config file.
2011-02-04 14:21:18 -08:00
bc2e254b55
minor: fix indentation, spacing on commit 3585130
...
this previous commit tries to look up the texture by name first before just using the uuid.
this allows correct resolution of inventory textures which have uuids as names.
2011-02-04 21:55:22 +00:00
3585130ac8
SetTexture_fix
2011-02-04 21:52:06 +00:00
456cdee5ce
minor: correct a log spelling mistake that was pointed out to me
2011-02-04 21:42:45 +00:00
2ddec29c61
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 21:15:41 +00:00
144f367863
Bug fixed on map search for HG. Affected queries that had a region name at the end.
2011-02-04 12:57:22 -08:00
034327b51f
Send object date to viewer in microseconds (Fixes mantis bug #3990 )
2011-02-04 20:55:41 +00:00
1613d89383
minor: Correct misspelling of neighbour in log messages.
...
Thanks Fly-Man-
2011-02-04 20:51:51 +00:00
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
cf24069227
Change UpdateAgent (for changes in agent position) to be sent
...
once to each simulator rather than once to each region. This
should help with some of the delays caused by multiple outstanding
requests to a single service point.
2011-02-03 12:43:46 -08:00
8fdc810a23
Addresses mantis #5360 : CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
2011-02-03 04:07:36 -08:00
4f7cf491e6
Comment out texture CAPS 'texture not found' message for now
2011-02-02 20:02:10 +00:00
2413e9eb3f
Record number of resent packets in LindenUDP stack and display in stats report
2011-02-02 20:00:50 +00:00
2344150b6e
Stop double counting dequeued packets for packets sent number
...
This is already being incremented in LLUDPServer.SendPacketFinal for every packet
2011-02-02 19:39:33 +00:00
0898be5750
Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that it returns null if the user isn't a member of the group.
...
This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
2011-01-31 22:54:36 +00:00
8f008f394d
Flash out the prim count module
2011-01-29 04:27:20 +00:00
e7d5ff9bd2
Create the structure of classes and interfaces to replace the cruft that
...
is in the land management module today
2011-01-29 02:24:27 +00:00
0936455725
Adding the prim count module skeleton
2011-01-28 23:44:17 +00:00
38bfdb0c9d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 23:22:16 +00:00
5942385d0e
Add the prim count interfaces
2011-01-28 23:21:41 +00:00
933f47e89d
Comment out unused call to GridService in TeleportAgent()
2011-01-28 22:59:07 +00:00
a4acf485d7
minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful
2011-01-28 22:50:49 +00:00
1fcb919798
If a non-globbed included file from config cannot be found then warn the user
2011-01-28 22:46:29 +00:00
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
a0380af18f
Display supported file extensions/formats in "terrain load help" (Mantis #5349 )
2011-01-28 21:24:05 +00:00
9798b044fe
Added loading and saving of terrain files using Terragen format (Mantis #1564 )
...
Terrain files can now be loaded and saved using the Terragen (.ter) format.
Selection of the terrain file loader to use is now based on the extension
of the filename being loaded and the data is loaded using a memory stream
instead of writing it to a file and then loading it from the file.
2011-01-28 21:19:53 +00:00
ab48caad08
Make the new style stuff compatible with the older revision
2011-01-28 05:25:53 +00:00
188d86998d
Fix up QueryAccess to also check parcels
2011-01-28 04:09:04 +00:00
d90b0c53ec
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 02:38:14 +00:00
80bf95b7b4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 02:34:45 +00:00
5a0cb7d37e
Thank you, Goetz, for a patch to fix prim count display in cut regions.
2011-01-28 02:34:07 +00:00
f9ea5e69c5
Refactor: Break out LoadObjects() and LoadParcels() from a longer method
2011-01-27 21:07:21 +00:00
19e4473a97
Put confirmation on "land clear" command to avoid nasty accidents
2011-01-27 20:57:59 +00:00
be3685b1a2
When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
...
The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.
Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
42c0dbf49a
Show local IDs in "land show" output.
...
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
ab9a0f2f1d
Add "land clear" command
...
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
5a26dc2743
Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
...
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
e33cb3db93
remove unused CreateBaseLand()
2011-01-27 16:50:41 +00:00
b0f641fa15
Make it work
2011-01-27 06:41:07 +00:00
17801bd78b
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 05:33:46 +00:00
adb341e32f
Also set Godlike flag. Might be useful
2011-01-27 05:33:01 +00:00
61b67b2ead
Add TeleportFlags.ViaRegionID to the flags sent on login when the region
...
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
2bab8e5538
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-26 13:35:21 -08:00
240c0eaf1d
Remove the RestorePresences functions (which don't seem to be doing
...
anything) and clean up the code in AddNewClient (so Appearance only
gets assigned once, not three times).
2011-01-26 13:33:34 -08:00
8eb2789ae1
Add some comments on ILandObject.StartPoint and EndPoint
2011-01-26 21:19:22 +00:00
a0469daf75
Implement command "land show". This shows all the parcels on the currently selected region/s
...
This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00
c4727645b8
Removed a few more spurious appearance saves. When an avatar
...
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00:00
cc39d0bf4e
Fixes mantis #5343
2011-01-23 14:47:58 -08:00
Justin Clark-Casey (justincc)