b7237ef059
Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:35:33 +01:00
5c09cffe55
Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge
2011-10-25 02:27:35 +01:00
496c647ab5
Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge
2011-10-25 02:27:26 +01:00
e2de57ca29
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:26:56 +01:00
f6ea36b4fa
Fix a missing locking call
2011-10-25 03:15:28 +02:00
4215aea036
Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge
2011-10-25 02:15:13 +01:00
57b51287ae
Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge
2011-10-25 02:15:06 +01:00
f387e84e51
Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge
2011-10-25 02:15:01 +01:00
353f0c0e03
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 02:14:39 +01:00
585f1b189f
Merge
2011-10-25 02:08:43 +01:00
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
3cdea11e29
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
2011-10-25 01:54:07 +01:00
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
9dd7d9c16c
Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge
2011-10-25 01:53:24 +01:00
28d2103439
Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge
2011-10-25 01:53:02 +01:00
e43e1b49db
Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge
2011-10-25 01:52:54 +01:00
077e3500b2
Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge
2011-10-25 01:52:42 +01:00
a09e72c8cc
Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge
2011-10-25 01:52:26 +01:00
63cbdb9b2a
Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge
2011-10-25 01:52:19 +01:00
f4e4026a7a
Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge
2011-10-25 01:51:49 +01:00
fe014a05ac
Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge
2011-10-25 01:51:37 +01:00
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
24e260744a
Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge
2011-10-25 01:51:06 +01:00
69b480770a
Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:50:55 +01:00
b4395143e7
Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:50:07 +01:00
0a65e7cadc
Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmerge
2011-10-25 01:47:38 +01:00
be3939358b
Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:47:35 +01:00
506769c6a2
Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmerge
2011-10-25 01:43:27 +01:00
53caaa8236
Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmerge
2011-10-25 01:43:12 +01:00
747786aac0
Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge
2011-10-25 01:43:05 +01:00
d68b73bfba
Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge
2011-10-25 01:42:56 +01:00
a8cc81a37e
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 01:42:52 +01:00
9ceb98344a
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
2011-10-25 01:37:11 +01:00
13d635d1d7
Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge
2011-10-25 01:37:01 +01:00
8e69dde397
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:36:39 +01:00
0b833c458a
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
2011-10-25 01:35:51 +01:00
080a41e9f9
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
2011-10-25 01:35:30 +01:00
5f025d20fe
Fix ground sit autopilot
2011-10-25 00:53:39 +02:00
e14cb45b9b
Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()
...
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24 23:26:41 +01:00
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
79d5bc9beb
separate out future common setup code from EventQueueTests.AddForClient()
2011-10-24 22:29:13 +01:00
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
4c9400e646
Add optional getauthinfo and setauthinfo authentication service calls.
...
These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
2011-10-24 21:40:36 +01:00
4a6160e7ad
Fake an AgentCircuitData if none is available rather than crashing out
2011-10-24 18:22:36 +02:00
b868328d51
Comment out the uuid gatherer lines that I accidentally left in.
2011-10-23 03:14:32 +01:00
c2272a755f
Fix missing Busy-Mode Response
...
http://opensimulator.org/mantis/view.php?id=5748
2011-10-22 13:17:07 -04:00
3fc47275cf
Add case to Lightshare/Windlight
...
Thanks thomax for a patch to add handling for Sun/Moon pos.
2011-10-22 13:06:34 -04:00
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
30320505fa
redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency
2011-10-22 00:58:56 +01:00
bc2da4eaad
correct misleading method doc on CreateNotecardAsset()
2011-10-22 00:55:50 +01:00
c4f8da7359
in AssetHelpers, store the actual text passed in to the method, not the string "data"
2011-10-22 00:45:47 +01:00
5d7eaedbeb
encode notecard assets in proper format for tests, rather than just using whatever string is given
2011-10-22 00:21:45 +01:00
9b3bbedeea
refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
2011-10-22 00:13:46 +01:00
a1f05a289d
RemoteAdmin - Added optional terrain loading on region create using parameter heightmap_file to specify the terrain file to be loaded
2011-10-21 23:12:01 +01:00
8cca9fe23c
Allow updating the movement animation while flying. This fixes falling,
...
splatting and ground sit. Walking to a ground sit still doesn't work.
2011-10-21 03:15:56 +02:00
4241ee5dfa
very minor removal of old commented out line of code in OdeScene
2011-10-21 00:04:36 +01:00
fd0e65b0b1
Fix up the animator and ScenePresence to like each other again
2011-10-20 23:11:53 +02:00
30fe66d3ab
remove unnecessary null check on _collisionEventPrim
2011-10-20 20:58:29 +01:00
9c43020876
Get OdeScene to use passed in time step rather than hard-coded 0.089
...
However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
2011-10-20 20:48:51 +01:00
6837e44d07
Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime)
...
SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame.
This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog.
This doesn't appear to play much practical role right now.
ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
2011-10-20 19:44:59 +01:00
b63ec987b0
For now, stop passing timeStep into methods where it's not actually used.
2011-10-20 17:54:32 +01:00
f16d125027
Change wording on asset requests.
...
Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
2011-10-19 23:56:17 +01:00
9ab2943abf
Removed redundant NotInTransit function from ScenePresence. IsInTransit=false does the same thing and NotInTransit was not used anywhere.
2011-10-19 15:50:09 -07:00
eac29396d9
Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line endings from previous commit.
2011-10-19 15:38:25 -07:00
8b20faf06c
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-19 14:43:16 -07:00
da794f34a5
Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID.
2011-10-19 14:41:44 -07:00
601dabb1b7
Extend scripts stop/start/suspend/resume console commands to allow action on a single script by giving the script item id (which can be found via scripts show).
...
Not an ideal way to do this on a region with many scripts. Needs refinement later.
2011-10-19 22:30:31 +01:00
32c3faedd6
Add "scripts stop" and "scripts start" console commands.
...
These will stop all running scripts and start all stopped scripts respectively.
A stopped script does not save any events for later processing.
2011-10-19 21:40:28 +01:00
f836710af5
minor: improve command help on scripts suspend/resume
2011-10-19 21:34:55 +01:00
5607fd3af8
Fix resume scripts.
...
On resume, we need to place requeue the script for event processing if there are any events on the queue.
Also need to do this under m_Script lock in order to avoid a race
2011-10-19 21:30:37 +01:00
3cf7fb4eca
Add "scripts suspend" and "scripts resume" commands.
...
These aim currently to suspend and resume all scripts.
However, resume isn't currently working due to what looks like a bug in resume functionality itself.
2011-10-19 20:53:24 +01:00
b45219065c
on log and "show scripts" messages, show script item UUID rather than asset UUID
...
The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
2011-10-19 20:26:05 +01:00
116fbe8258
add current script status to "scripts show" command (running, suspended, etc.)
2011-10-19 20:24:07 +01:00
ecad9f9fd5
Add "show scripts" command to show all scripts currently known to the script engine in the current region.
...
Also added synonym of "scripts show"
2011-10-19 20:09:02 +01:00
d9184eceab
Add option to allow remote http calls to setpassword in the AuthenticationService.
...
This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini
Default is false as before.
2011-10-19 19:03:17 +01:00
fe484ab331
Slightly change log message in LoadRegionsPlugin
2011-10-19 01:22:07 +01:00
178b8d0926
Region-UUID - can not be zero-uuid
...
http://opensimulator.org/mantis/view.php?id=3426
2011-10-19 01:19:21 +01:00
4cffdf15ba
Make ScopeID optional for http GetAccount and GetAccounts
...
If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
2011-10-19 00:34:54 +01:00
9f171041c9
Make PrincipalID a synonym for UserID in GetUserAccount
2011-10-19 00:23:06 +01:00
97c66f8eac
Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output
2011-10-19 00:16:53 +01:00
9d59b285bb
Allow an http call to set account details if AllowSetAccount = true in [UserAccountService].
...
As before, default is false to not allow these calls.
2011-10-19 00:06:40 +01:00
c85a780583
Provide an option to allow remote calls to the CreateUser method on the UserAccountService
...
Default is false, as before.
Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces.
Only Ruths can be created at present.
Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
2011-10-18 22:51:40 +01:00
581885da75
Temporarily put in log lines to record time taken to set terrain in OdeScene.
2011-10-18 21:21:15 +01:00
03202ada29
Store scene identifier passed in to OdeScene for later debug messages
2011-10-18 21:11:13 +01:00
1d4cd76e8a
Don't bother taking OdeLock during OdeScene construction, since there can be no contention until the object is constructed.
2011-10-18 21:03:41 +01:00
f10a824e47
Remove unnecessary lock of OdeLock in OdePrim.changeadd()
...
This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
2011-10-18 20:58:59 +01:00
5515c45e3b
minor: method doc to explain a lock of OdeLock
2011-10-18 20:56:11 +01:00
71d221cdc0
Remove the unused CollisionLocker from ODE
...
Despite its name, this wasn't actually being used in any collision checking
2011-10-18 17:35:58 +01:00
aeb4ff0274
Allow an avatar to be explicitly named to the "debug packet" command
2011-10-17 20:58:23 +01:00
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
96ff2c63ed
Add avatar names to debug packet output
2011-10-17 20:37:01 +01:00
62a63f834b
refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing
2011-10-17 02:04:20 +01:00
79c13cd997
rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more understandable
...
This makes something like osNpcSit(npc, llGetKey(), OS_NPC_IMMEDIATE) now become
osNpcSit(npc, llGetKey(), OS_NPC_SIT_NOW);
This is why it's in development :)
2011-10-17 01:57:23 +01:00
de161585c0
Implement osNpcStand(<npc-id>)
...
Allows you to stand an NPC that has sat.
2011-10-17 01:56:25 +01:00
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
35def547f7
Merge branch 'master' into bigmerge
2011-10-12 16:45:48 +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
d2dc2316c2
Merge branch 'master' into bigmerge
2011-10-12 09:26:35 +01:00
1d379a9c7b
Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken
2011-10-12 07:46:13 +02:00
e3effc4974
Merge branch 'master' into bigmerge
2011-10-12 07:29:35 +01:00
4b069d23d0
Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge
2011-10-12 07:24:53 +01:00
816d0de11a
Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge
2011-10-12 07:24:46 +01:00
628ca122b8
Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge
2011-10-12 07:24:34 +01:00
de109797f2
Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge
2011-10-12 07:24:26 +01:00
cc637b78fb
Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge
2011-10-12 07:24:13 +01:00
ad46ad1ab2
Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge
2011-10-12 07:23:54 +01:00
98ae98510c
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
2011-10-12 07:23:40 +01:00
5d3acc9ac3
Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge
2011-10-12 07:23:32 +01:00
b716d98e23
Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge
2011-10-12 07:23:18 +01:00
3657cd436c
Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge
2011-10-12 07:23:08 +01:00
cc4b1c69d8
Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge
2011-10-12 07:23:02 +01:00
3a290e581a
Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
...
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2011-10-12 07:09:41 +01:00
2c23fc9e68
Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge
2011-10-12 07:09:04 +01:00
d03d486dbb
Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge
2011-10-12 07:08:46 +01:00
2f6cc77154
Adjust CM version tag
2011-10-12 07:08:23 +01:00
336f6f7ec4
Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge
2011-10-12 07:07:37 +01:00
492a50d6f7
Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge
2011-10-12 07:06:59 +01:00
e18a76f6d6
Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge
2011-10-12 07:05:57 +01:00
00285082d8
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
2011-10-12 07:05:47 +01:00
abfb0c9399
Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge
2011-10-12 07:05:18 +01:00
b251423b11
Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge
2011-10-12 07:04:28 +01:00
86e28724bd
Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge
2011-10-12 07:03:58 +01:00
265e9d094d
Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge
2011-10-12 07:02:36 +01:00
b2090e711f
Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-12 07:02:15 +01:00
f4de1a6d9b
HACK: Remove advanced property resending until it is fixed properly in core.
2011-10-12 06:48:40 +02:00
9733b64dc8
Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-12 02:02:46 +01:00
ba978d0d77
Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge
2011-10-12 01:43:52 +01:00
4e88fe42e4
Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge
2011-10-12 01:42:39 +01:00
5f2cb7caa3
Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmerge
2011-10-12 01:42:30 +01:00
77f9d98831
Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge
2011-10-12 01:41:59 +01:00
d595f9fd85
Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge
2011-10-12 01:41:52 +01:00
b0ee174296
Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge
2011-10-12 01:41:44 +01:00
e68226afd3
Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge
2011-10-12 01:41:28 +01:00
c0555f6be6
Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge
2011-10-12 01:39:38 +01:00
f5e78ca616
Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge
...
Conflicts:
OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
2011-10-12 01:31:34 +01:00
6af388ded9
Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge
2011-10-12 01:30:14 +01:00
30b2fc6aea
Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge
2011-10-12 01:29:47 +01:00
59e3ac1ec6
Fix rezzing coalesced object broken by core merge
2011-10-12 00:50:13 +02:00
1c2b5d99c9
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-12 00:10:15 +02:00
e4f3ba8610
Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-12 00:10:30 +01:00
a9af618842
Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-11 23:32:16 +01:00
0b96991ab4
Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge
2011-10-11 23:28:16 +01:00
b8e22b25fd
Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
2011-10-11 23:28:06 +01:00
1ca86114e1
Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge
2011-10-11 23:22:23 +01:00
3359bafc3e
Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge
2011-10-11 23:22:08 +01:00
1b3ea64fe9
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 23:21:36 +01:00
ef9a811ea6
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-11 23:17:47 +01:00
7891433148
Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge
2011-10-11 23:16:43 +01:00
0ae63d0e8b
Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge
...
Conflicts:
OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
2011-10-11 23:16:19 +01:00
efaa113fb9
Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge
2011-10-11 23:15:41 +01:00
95a1a804bf
Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge
2011-10-11 23:15:29 +01:00
ae67eb0a1f
Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge
2011-10-11 23:15:17 +01:00
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2011-10-11 23:14:23 +01:00
61a8e35b7d
Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge
2011-10-11 23:08:38 +01:00
b9826035f6
Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge
2011-10-11 23:08:18 +01:00
a157fdedcf
Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-11 23:08:07 +01:00
66c06c5685
Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge
2011-10-11 23:02:19 +01:00
ea8350a526
Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge
2011-10-11 23:02:04 +01:00
5536cdf90c
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
2011-10-11 23:01:52 +01:00
ed1bb2081e
Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge
2011-10-11 22:54:03 +01:00
308b6937ad
Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge
2011-10-11 22:53:53 +01:00
83ec064868
Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-11 22:53:27 +01:00
b40157fc9b
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
2011-10-11 22:51:44 +01:00
75fd256ef8
Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge
2011-10-11 22:43:27 +01:00
833420e167
Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge
2011-10-11 22:42:51 +01:00
652c59c0a9
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
2011-10-11 22:42:18 +01:00
2e47d24832
Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 22:41:51 +01:00
a671fcfd2c
Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge
2011-10-11 22:33:58 +01:00
6101de2316
Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:32:10 +01:00
9935eb6578
Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge
2011-10-11 22:26:18 +01:00
6e6c70be15
Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge
2011-10-11 22:24:40 +01:00
1ba53850b2
Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge
2011-10-11 22:23:40 +01:00
34954172a1
Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge
2011-10-11 22:23:16 +01:00
b9de3b7f5b
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
...
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
2011-10-11 22:22:34 +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
03d533dc1e
Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge
2011-10-11 22:15:25 +01:00
341efb0942
Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge
2011-10-11 22:12:25 +01:00
68a42af30f
Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge
2011-10-11 22:11:55 +01:00
6978ae0a59
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-11 22:11:44 +01:00
a8747b3888
Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge
2011-10-11 21:41:30 +01:00
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
2011-10-11 21:32:24 +01:00
3ac15c03b2
Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge
2011-10-11 21:32:14 +01:00
0fa21b7b5e
Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge
2011-10-11 21:31:48 +01:00
673886d231
Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge
2011-10-11 21:30:42 +01:00
986a3838a6
Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge
2011-10-11 21:29:58 +01:00
5b40389352
Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge
2011-10-11 21:29:04 +01:00
8fac7c0650
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
2011-10-11 21:28:23 +01:00
9d22110c23
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
2011-10-11 21:22:58 +01:00
cc1fe354d0
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:21:44 +01:00
c95c8ab246
Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:06:06 +01:00
7d2a3dc174
Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 20:57:31 +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
9500415c61
Merge branch 'careminster-presence-refactor' into bigmerge
2011-10-06 17:57:28 +02:00
300d357573
Fix physics proxy position when linking and rotating the root prim only
2011-10-06 17:55:20 +02:00
363a99593d
Change the asset connector to allow connection to different asset servers
...
depending on the first two digits of the asset id.
2011-10-06 15:39:21 +02: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
e15917f465
Fixed a movement regression - Kitto's jump code is no longer needed (plus it's an eyesore)
2011-09-14 19:34:03 -07:00
1129b80629
Fix a rather stupid VS warning "The operation overflows at compile time in checked mode" - doesn't make much sense to me, but for some reason it doesn't like 256 - 6 when 256 is a constant...
2011-09-14 19:31:55 -07:00
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
cda4cd6b55
Merge fixes, and fix the build
2011-09-14 18:46:42 -07: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
03f6734f43
First set of merge fixes
2011-09-07 09:42:18 -07: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
9cc2d0b60a
Now merging the core changes.
2011-09-04 08:30:23 -07:00
af59352c4c
Change of tactic. Reverting this to the careminster version, then i'll selectively merge the changes made to core.
2011-09-04 07:54:17 -07:00
9ab951a954
I fucked up the merge for SOG, so reverting back to OpenSim Core's version...
2011-09-04 07:38:25 -07:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07: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
6ab5ca2bda
Guard another nullref
2011-08-09 22:11:27 +02:00
0e9dda91cb
Guard against a bad login leaving us with a null queue
2011-08-09 20:55:06 +02: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
434091d3f4
Allow removing users from search and avatar picker
2011-07-31 17:04:22 +02: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
04eaca2af8
Ensure that packet headers get parsed correctly
2011-07-27 08:35:19 +02:00
5c012cac54
Add a timer to monitor the heartbeat. Restart it if it's been dead for
...
5 seconds.
2011-07-25 04:16:53 +02:00
2e83b48873
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-07-23 18:34:46 +02:00
c2de0c930c
Fix failure to find avatars due to trainling spaces being sent by viewers.
2011-07-23 18:29:43 +02:00
4cdc8806fb
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:40:38 +01:00
96174595da
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:39:32 +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
705f70064e
Fix merge artefact
2011-07-22 12:38:08 +01:00
0e52010c0e
Thank you, Michelle Argus, for a patch that adds reading the agent limit
...
from XML properly.
2011-07-22 12:36:49 +01: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
cbaa4aa88f
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 18:16:44 +01:00
c768d18c92
Revert "Tidy up a superfluous AddPrimShape override in PhysicsScene"
...
This reverts commit f5623b5c39
2011-07-19 18:16:36 +01:00
f5623b5c39
Tidy up a superfluous AddPrimShape override in PhysicsScene
2011-07-19 10:15:34 -07: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
b5fcd2caba
Fix some local id issues in physics glue
2011-07-15 20:11:12 +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
c7dbd7cbd0
Fox some local id issues in physics glue
2011-07-15 19:36:00 +02:00
8dff9d564d
Revert "Add localid support to ch0de properly"
...
This reverts commit bb402d0d95
2011-07-15 19:35:49 +02:00
8925fb5537
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-07-15 19:30:23 +02:00
bb402d0d95
Add localid support to ch0de properly
2011-07-15 12:08:40 -07:00
cc69d12d54
Fix a raycast issue
2011-07-15 11:12:10 -07:00
7fac07d9ab
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-07-15 18:48:43 +02: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
b59b1ff3d9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-07-10 18:16:09 +02:00
9c9b3e3976
Dammit, loggin the type of an exception without providing the FULL DUMP is NOT
...
going to help squash bugs!
2011-07-10 17:27:20 +02: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
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +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
fedfa02b64
Remove another core SNAFU. AbsolutePosition is NOT equal to group position
...
in attachments! Breaks resizers!!!
2011-07-06 21:20:11 +02:00
06d5989f4d
Fix parcel prim count and max reporting. Viewer already multiplies.
2011-07-06 09:59:05 +02:00
f45746613d
Revert "If a user has the rights to edit a parcel's properties, then also allow them always to enter that parcel."
...
This reverts commit b8e7258051
2011-07-05 04:02:16 +01:00
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
719e0702be
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-07-05 03:13:39 +02:00
30482e7ae5
Don't store the default WL profile. This will prevent "valid" from being
...
set on the default profile and hopefully finally fix day and night
2011-07-05 03:11:56 +02:00
d2fc23c034
Stop displaying "Sending windowslig profile to client" when WL is disabled
...
or there is no valid WL for that region.
2011-07-05 03:08:36 +02: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
5f927dc104
Merge branch 'master' into careminster-presence-refactor
2011-06-30 00:26:03 +01: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
1b7fec0842
Remove friends debug spam
2011-06-20 03:20:32 +02:00
f4f55c4d6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-06-20 03:08:56 +02:00
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
163ee82168
Add some flags to control content in search better
2011-06-20 02:29:09 +02: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
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01: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
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01: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
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01: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
a41051f1dd
Make the last otem in a list created with llCSV2List findable
2011-06-05 17:08:21 +02: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
458a8c6d0b
Persist Buoyancy in inventory
2011-06-02 18:44:51 +02: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
61bf2bf2dd
Make Buoyancy a prim property
2011-06-02 18:32:25 +02: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
f02fbdbc68
Merge branch 'master' into careminster-presence-refactor
2011-05-27 01:10:02 +01: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
3e54aad76c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-26 16:29:45 +02:00
4d324f1b74
Change setter on changed flags to public so modules can reset it
2011-05-26 16:29:00 +02:00
03525959c9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-26 03:42:45 -07:00
b000d9ba72
Some additional protection, it seems that responsedata needs to be locked, but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
2011-05-26 03:42:01 -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
932db1c374
Add PayPrice to serialization format Xml2
2011-05-25 11:30:21 +02: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
62e0c96036
Allow disabling the legacy backup mechanism to avoid the object clone if
...
backup is not used.
2011-05-24 03:37:25 +02:00
d5841e07c2
Create a method to force the script engine to save state from outside
2011-05-24 02:40:59 +02: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
8b42f824d3
Add an event for an orderly region shutdown that fires once per region before
...
the SceneGraph is torn down.
2011-05-24 00:53:28 +02:00
b9fb7cdf9f
Merge branch 'master' into careminster-presence-refactor
2011-05-23 03:39:20 +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
9c1f799582
Implement llGodLikeRezObject and llGetUsedMemory
2011-05-22 21:01:31 +02:00
dc95e38e42
Add stubs for unimplemented lsl functions
2011-05-22 14:59:18 -04:00
89705b19c7
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-22 20:00:59 +02:00
be1996f121
Merge branch 'master' into careminster-presence-refactor
2011-05-22 20:23:25 +01: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
e62d1cc480
Merge branch 'master' into careminster-presence-refactor
2011-05-20 22:38:05 +01:00
fdbcd2fbf9
Add a missing virtual keyword
2011-05-20 23:27:16 +02:00
8a46484a59
Make public interface methods in MySQLSimulation data virtual so the CM
...
data layer can inherit from it
2011-05-20 23:17:46 +02: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
74dd619575
If a response cannot be obtained (the script has no handler) return a more friendly 500 error instead of crashing out with a null reference and letting the connection hang
2011-05-17 19:12:37 -07:00
1f17960e67
Also fix the locking of url.requests and tidy the locks in general
2011-05-17 18:56:55 -07:00
e847d1d83f
Lock m_requestMap properly to prevent some nasty access errors and the resulting downward spiral
2011-05-17 18:44:07 -07: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
6bac16fd88
Fix up handling of the estate dialog to prevent duplication of ban list names.
...
Allow more than 61 names in ban list without crashing the viewer.
2011-05-15 14:55:36 +02: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
37a7b87862
Merge branch 'master' into careminster-presence-refactor
2011-05-14 21:09:52 +01: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
344815ab79
Globally throttle script channel 0 comms to 5/s with 10s burst to prevent lag
...
griefing attacks
2011-05-14 17:24:59 +02:00
d773d89145
Plug a hole that allows selling a copy of no copy objects when using hacked god mode to fool the viewer into thinking it can set that sale type
2011-05-14 17:24:22 +02:00
c4fad3d887
Fix up a linking issue
2011-05-14 09:13:31 +02: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
75d4956ee5
Merge branch 'master' into careminster-presence-refactor
2011-05-13 12:05:46 +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
1bd949614a
Merge branch 'master' into careminster-presence-refactor
2011-05-09 18:37:35 +01: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
9daad86717
Convert the prim count module into a permissionsmodule
2011-05-09 02:47:40 +02:00
f644c0346b
Incremental - Just did some cleanup of comments and class name change to clean up from using BareBonesNonShared as a template.
2011-05-09 02:35:57 +02:00
939026d874
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 02:35:32 +02:00
d3c3feb6b1
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 02:35:04 +02: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
c164be1ee5
Fix bans so the region owner and estate managers can't be banned by renters
2011-05-09 01:12:21 +02:00
73a9ebc21e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-09 01:00:35 +02:00
66a5906548
Merge branch 'master' into careminster-presence-refactor
2011-05-09 01:04:55 +01:00
dbf623a3d2
Add commands to delete objects by name, UUID, creator or owner
2011-05-09 00:59:32 +02:00
c8b9558039
Also compress the actual fatpacks
2011-05-08 23:52:31 +01:00
ade09d0fa1
Also compress the actual fatpacks
2011-05-08 23:23:33 +02: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
1fbf4c8300
Remove a spammy debug I left in. Disable TP cancel button at the point
...
of no return.
2011-05-08 21:36:51 +02:00
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +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
763666e2d6
Enable compressed (gzip) fatpack transfers.
2011-05-08 19:50:35 +02: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
5591abf9d1
Allow attachments to track the user's camera
2011-05-05 15:10:59 +02:00
e7e88c4db1
Merge branch 'master' into careminster-presence-refactor
2011-05-05 13:28:15 +01:00
f5bb6edd85
Squish a warning
2011-05-05 13:01:46 +01:00
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +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
6008ffe943
Merge branch 'master' into careminster-presence-refactor
2011-05-05 00:34:48 +01: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
3f7050173d
Attempt to make teleports more reliable. This may break redirection on login
2011-05-03 22:33:53 +02:00
61263e2ce3
Some private changes to the prioritizer: 30m steps instead of 10 and disable
...
the broken frontback math. Much better user experience.
2011-05-03 16:58:39 +02:00
aa73f99de6
Revert the CM prioritizer to the core version
2011-05-03 16:44:45 +01:00
af55eda16b
Merge branch 'master' into careminster-presence-refactor
2011-05-03 14:26:18 +01: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
8a398ef02d
When coming in from a legacy region without fatpacks, start scripts the
...
usual way
2011-04-30 16:01:54 +02:00
27891fddcf
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-30 14:23:20 +02:00
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
98fe37051a
Set the attachment data on scripted rez to allow toasters to work.
2011-04-30 14:22:46 +02: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
57efed988c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-26 23:41:57 +01:00
4ed54dcc01
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-26 23:20:13 +02:00
e713b7e3bb
Try to repair attachments ion the fly if they are detached and reattached.
2011-04-26 23:18:52 +02: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
a6c53b1ba2
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-25 23:26:37 +01:00
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01: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
c411ab54ee
Merge branch 'master' into careminster-presence-refactor
2011-04-22 08:55:12 +01: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
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01: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
a1dce960d7
Add fix a minor bug
2011-04-21 22:45:46 +02:00
282e116f94
Honor agent limit for region crossings and teleports
2011-04-21 22:34:49 +02: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
204b8b7b7e
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-21 16:51:39 +01:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28: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
ccf63a9c63
Merge branch 'master' into careminster-presence-refactor
2011-04-18 21:04:09 +01:00
8533c63d89
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-18 20:36:26 +01:00
d1913f2429
Merge branch 'master' into careminster-presence-refactor
2011-04-18 20:17:29 +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
ec0aa7a90b
Fix up client implementations
2011-04-17 23:17:05 +02:00
dbf52b8cd1
Correct the delegate for classified deletes
2011-04-17 22:54:23 +01:00
0e3580066b
Merge branch 'master' into careminster-presence-refactor
2011-04-17 21:46:27 +01:00
03e725ad87
Mantis #5442 : Add admin_save_heightmap
2011-04-17 21:43:16 +01:00
c02e0e930d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-17 18:42:06 +02:00
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
2761810531
Fix the cert validation handler so that it will not block other parts of
...
the server doing ssl successfully.
2011-04-17 18:28:06 +02:00
5db8dcb563
Fix agent animation updates
2011-04-17 17:11:33 +02: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
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01: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
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
33dd74e410
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 03:50:27 +02: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
407c2b1823
Merge branch 'master' into careminster-presence-refactor
2011-04-06 09:22:55 +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
15e0b55e66
Merge branch 'master' into careminster-presence-refactor
2011-04-03 14:16:28 +01:00
89a65df160
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-03 14:15:29 +01:00
4256693a9e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 13:50:19 +02: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
3053b60143
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-01 21:52:04 +01:00
95e524dde1
A stab at making CHANGED_OWNER work
2011-04-01 18:49:53 +02:00
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +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
83c78029e3
Make the login service's call to the sim time out quicker so we have a
...
chance to try fallback before the client quits
2011-03-31 15:48:42 +02: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
45548873bd
Fix llGetParcelPrimOwners so that it returns LSL_Strings in the list rather than C# Strings
2011-03-29 09:28:27 -07: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
c39b391b6a
Many scripted items use long lists of llSetLinkPrimitiveParams rules to make prims "teleport" or jump large distances. When teleporting to 10,000 meters, this results in 1,000 SetPos calls, which severely rapes the physics and update system. This change modifies this behaviour to only provide one update after all the rules have been executed.
2011-03-28 13:28:59 -07:00
f7276dda02
Flag root prim changes for persistence
2011-03-27 14:20:25 -07:00
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
2d2a1acfae
Upgrade terse to full update on root rotation change. Not entirely sure why, but it seems that the terse update causes the first prim to rotate improperly on occasion (only temporary, it's fixed by the full update on deselect, but this will prevent confusion.)
2011-03-27 13:43:32 -07:00
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
553a195493
Fix issues with UpdateRootRotation and also increase efficiency
2011-03-27 13:09:19 -07: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
8338b74d3f
Add giving lists of items to another prim
2011-03-25 02:39:17 +01:00
5ef490b5ad
Switching vivox to https for production use
2011-03-25 01:10:41 +01: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
3dc9b0ef18
Remove a spammy debug
2011-03-23 00:32:19 +01:00
985f78dbf5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-23 00:06:43 +01:00
bbbcb45398
Fudge the group join permissions for god user in god mode. Allows to join
...
every group without an invite.
2011-03-23 00:05:27 +01:00
78a7c6cace
Remove the forced landmark and home poermissions because they are now in the
...
database
2011-03-23 00:02:41 +01:00
edf9f3d630
Raise the position for lures by 2m to prevent the target avatar getting stuck
...
in a prim.
2011-03-23 00:01:41 +01:00
764e8c2a43
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-22 20:33:24 +00:00
c330f89fb1
Add some more fields to Estate settings and make them work.
...
Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
2011-03-22 10:43:43 +01:00
3cfaf4c225
Adding a helper function lifted from Aurora. Not for core.
2011-03-22 09:29:40 +01:00
a073ca57da
Add a definition for a region flag to omit a region from traffic counting
2011-03-22 09:23:46 +01: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
b70596c15c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-21 13:31:22 -07:00
4d4765aa28
Since we've plugged the leak, now increase URLs to 5000 since the limit is being hit in several sims
2011-03-21 13:30:53 -07: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
e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
7b11a83c08
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 05:52:29 +01:00
1241cc50f1
Revert "Switch Vivox voice module to https"
...
This reverts commit a8096b52cd
2011-03-18 11:25:08 +01:00
a8096b52cd
Switch Vivox voice module to https
2011-03-18 10:59:32 +01:00
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
13aae75ad8
Prevent god users from being stopped logging into a region
2011-03-16 22:43:49 +01: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
3dc877c59f
Merge branch 'master' into careminster-presence-refactor
2011-03-14 14:48:00 +00:00
f54ddd88a2
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 12:56:50 +01:00
4a5560a86e
Change avatar picker search to work properly when two name parts are used
2011-03-12 13:06:13 +01: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
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +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
0719ffa6fa
Change protection from being teleported home to extend to incognito gods.
2011-03-01 23:34:02 +01: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
9b277b372b
Merge branch 'master' into careminster-presence-refactor
2011-02-27 19:47:37 +00:00
11105d38bd
Fix a few little things
2011-02-27 18:55:17 +01: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
9be1d2aef1
Merge branch 'master' into careminster-presence-refactor
2011-02-24 02:37:21 +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
87e9acf714
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-21 04:16:33 +01:00
1a31f7b579
Allow modifying a no mod object through llGiveInventoryItem if the object
...
sets allowed drop. This makes breedables feasible.
2011-02-21 04:14:49 +01:00
efd8d03c59
Prevent giving copies of no copy scripts or transferring no trans scripts
...
through LSL
2011-02-21 04:02:47 +01:00
04dc43f591
Prevent attaching things you don't own from inworld. Simple solution for a
...
complex issue
2011-02-21 04:02:16 +01:00
86decb2aa8
throttle group notices to max of 4 threads at a time
...
...otherwise it can create hundreds of threads and hang
2011-02-20 15:57:57 +00: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
5a78161e74
Restore heartbeat thread
2011-02-19 01:32:20 +01:00
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00: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
c79f79fc84
Add needed dummy to sample money
2011-02-17 18:51:43 +01: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
3f93db8371
Streamline ban line processing. Remove remnants of old advisory messages.
...
Centralize ban checking and prepare for adding a "ban and eject" function.
2011-02-16 05:23:30 +01:00
cfce0aa448
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 05:22:05 +01:00
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +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
ba03e2e262
Add the country functions in the careminster API
2011-02-12 20:59:09 +01: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
413f0c6848
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-11 23:53:52 +01:00
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +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
f62cb1fcbe
Temp fix (or is it a fox?) for map weirdness
2011-02-08 21:13:31 +01: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
8c20f94939
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-07 22:26:09 +01:00
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
6becaf65e1
Fix merge issues
2011-02-07 22:28:59 +00:00
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
e8ba3d3a10
Prevent a nonexistent inventory item from throwing an exception
2011-02-07 22:25:43 +01: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
511b12db6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-04 17:32:31 +00:00
b6dda231f2
Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for Avatar-attached.
2011-02-04 17:31:52 +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
9a9c9644ac
Repair x-query-string
2011-02-03 17:25:55 -08: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
595891409c
Add another flag
2011-02-02 21:45:37 +01: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
722ae4f031
Add a missing constand and fix ToDoubleList to not eat the last memeber
2011-02-02 20:22:03 +01:00
4a56038d11
Change the timeout on WebUtil to 20s to help make more tps succeed
2011-02-02 03:28:47 +01:00
ba39d9f0e6
Squash a nullref
2011-02-02 03:10:39 +01:00
e5ef993f2b
Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request!
2011-01-31 18:01:53 -08: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
35d29ef3e3
If llHTTPRequest results in an error, still attempt to get the response text. If we can't (which implies the server is unreachable), return the StatusDescription as before.
2011-01-29 19:38:05 -08:00
a2d51f0ff4
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-29 12:46:47 -08:00
188bdfc878
Ignore duplicate llHTTPResponse calls to the same request. Prevents response corruption. Only the first llHTTPResponse call is obeyed, akin to SL.
2011-01-29 12:45:53 -08:00
c14acf8a06
Adapt to CM
2011-01-29 04:51:11 +00:00
24a768a99b
Merge branch 'master' into careminster-presence-refactor
2011-01-29 04:47:32 +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
87ed39c953
Significantly increase the total number of URL's available. In second life, the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k.
2011-01-28 16:51:35 -08: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
13d4fedf7a
Fix a discrepancy vs. SL with parsing x-query-string
2011-01-28 13:45:27 -08: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
ffbfc14689
Make llRequestAgentData shout an error instead of crashing the script when an invalid UUID is passed to it.
2011-01-28 09:55:46 -08: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
d91ee131b9
Make the new style stuff compatible with the older revision
2011-01-28 04:31:21 +01:00
3bce53b6e6
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 04:05:49 +01:00
9abaac4d60
Correct chat source location for Av seated on daughter prim.
2011-01-28 04:35:43 +00:00
0ea8046545
Change the way ban lines are handled. Remove a lot of useless stuff designed
...
to physically move the avatar and instead just re-set the position. Ban lines
now work fully.
2011-01-28 04:04:30 +01:00
d90b0c53ec
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 02:38:14 +00:00
3834000778
Change the way ban lines work
2011-01-28 03:35:59 +01: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
657c14c5db
Fix up QueryAccess to also check parcels
2011-01-28 03:07:25 +01:00
566eff17de
Comment a very spammy debug message that was being output directly to console.
...
My last fox that makes bumping into sim borders/bans work makes this spam
endlessly.
2011-01-28 01:46:30 +01:00
57bf5d9b2a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 02:37:59 +00:00
3f200da878
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:36:20 +00:00
7492131bb6
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 01:37:37 +01: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
3435816541
Merge branch 'master' into careminster-presence-refactor
2011-01-27 20:54:02 +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
b13eac9996
Make the estate setting "Allow direct teleport" override the constraint
...
of local tepeports to landing points like it is meant to
2011-01-27 07:07:33 +01:00
2a9e712cb4
Let gods TP in wherever they like while in god mode
2011-01-27 07:03:43 +01:00
8568c6a7c0
Implement "Cannot teleport closer to destination" message
2011-01-27 06:57:54 +01:00
1143e022b4
Make landing points work on local teleports. Constrain owners and gods to
...
landing points when coming from off sim (matches agni) to prevent landing
in floors or other prims.
2011-01-27 06:45:53 +01: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
eca82d90c2
Change the way landing points are honored
2011-01-27 06:04:56 +01:00
d894007920
Make it work
2011-01-27 05:46:31 +01:00
4cc8d84281
Fix build break
2011-01-27 05:30:39 +00:00
42c22f41dd
Merge branch 'master' into careminster-presence-refactor
2011-01-27 05:18:28 +00:00
c43b892f3a
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 04:14:41 +01:00
1f19bd5f90
Also set Godlike flag. Might be useful
2011-01-27 03:54:41 +01:00
3b8b606eeb
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 03:49:32 +01:00
0e1d28a862
Clear user account cache before checking flags on login. This will make AV
...
and other bannable flags work in this case.
2011-01-27 03:05:33 +01:00
dd1980c24c
Add an interface for a region's user account cache
2011-01-27 02:58:14 +01:00
307a2c61ef
Fix merge artifacts
2011-01-27 02:43:52 +01:00
3321f9d745
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-27 02:29:10 +01:00
11c742a5a8
Make bans work for teleport. Now teleport will complete block if the user
...
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
2011-01-27 02:16:41 +01:00
31fb448cfc
Mostly revert the last commit with the aim of searching for a better solution
2011-01-26 17:06:17 -08:00
6b27587bc7
Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/
2011-01-26 16:25:08 -08:00
3ecf712e4d
Add userFlags check to isBanned. This checks bans against DenyAnonymous and DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on .
2011-01-26 14:20:39 -08: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
04c62c4959
Revert my previous SHA1 commit in favour of a better implementation
2011-01-26 12:54:12 -08:00
63dcd44e87
Provide an SL compatible llMD5String function across all platforms
2011-01-26 12:47:43 -08:00
4d3696d658
Make llSHA1Hash SL compatible when using characters like the euro symbol (€)
2011-01-26 12:40:33 -08: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
3c075aaf46
Reproduce a corner case behavior for llListReplaceList
2011-01-25 16:19:29 +01:00
b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00:00
aa6c097cca
Complete country support
2011-01-24 03:08:00 +01:00
649d9ef934
Fix script data not being reset as it should be
2011-01-24 02:20:54 +01:00
dbbf43663e
Add a careminster API to scripting again
2011-01-24 02:16:28 +01:00
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00
cc39d0bf4e
Fixes mantis #5343
2011-01-23 14:47:58 -08:00
17787e7c87
Completely nixing flags from the client causes wearables to break. Fix it
...
so we let the lowest byte through.
2011-01-22 19:00:46 +01:00
a32381cb9b
stop extremely old region serialization commands from appearing in the console
...
as far as I know these are unused and unsupported. Please re-enable if this is not the case. This does not effect save-xml[2]/load-xml[2]
2011-01-22 00:27:34 +00:00
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
41105948bd
remove some mono compiler warnings
2011-01-21 23:19:52 +00:00
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
bf5ec8cb88
remove some mono compiler warnings and unnecessary dictionary instantiations
2011-01-21 22:51:52 +00:00
5f3f7c3405
minor: remove unnecessary newline from "show throttles" information
2011-01-21 22:48:49 +00:00
6ef7ea454c
Remove old 2 year unused linden stack region module shell
2011-01-21 22:48:04 +00:00
9971fdbcd5
properly format "show throttles" table
2011-01-21 22:31:46 +00:00
38debbc59f
crudely refactor table generation code for "show queues" and "show throttles"
2011-01-21 00:56:37 +00:00
c383dbd06d
implement "show throttles" command for showing current agent throttles and the server settings.
...
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
58eb6b5fa3
minor: help text adjustment for "show queues"
2011-01-20 23:22:45 +00:00
df740d8e5c
remove reference to CoreModules from ClientStack.LindenUDP
...
client stack uses modules in the same way that scene does - through their interfaces
2011-01-20 23:21:25 +00:00
1baf63dbae
Move "show queues" command out of OpenSim.cs and into a separate module.
2011-01-20 22:57:12 +00:00
f50780f4c2
remove unimplemented "show assets" command
2011-01-20 21:56:48 +00:00
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
b92673c1c9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-20 06:52:10 +00:00
bfa5b7850c
Fix drift of static prim.
2011-01-20 06:51:50 +00:00
d3dca7d25a
For now, comment out logging messages about IM sending, since these cause high spam for large group messaging
2011-01-19 01:50:02 +00:00
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
97c0430093
Downgrade and comment out some other caps messages for now
2011-01-19 01:10:09 +00:00
7f000ea88e
Correct "show queues" to show queued packet numbers for each client instead of bytes.
...
Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are.
2011-01-19 00:33:25 +00:00
f3968c4959
Merge branch 'master' into careminster-presence-refactor
2011-01-18 06:18:10 +00:00
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
06e225bc0b
Also fix MySQLXInventoryData
2011-01-18 01:31:14 +00:00
6306578fcf
Merge branch 'master' into careminster-presence-refactor
2011-01-18 01:28:50 +00:00
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
f73c90c633
Put the 'new' back to avoid a warning. Yes, we want to hide it.
2011-01-17 17:52:03 -08:00
a07375a7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 17:41:06 -08:00
c98d1cffe2
Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
2011-01-17 17:40:48 -08:00
75644e0f6e
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 01:26:42 +00:00
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
624bf23abb
force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet
2011-01-17 16:39:53 -08:00
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +00:00
c544f0d0c5
Prune some of the excess logging for client logins.
...
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
523628dca3
minor: remove mono compiler warnings
2011-01-18 00:14:58 +00:00
8233ef25ba
Reduce amount of debug lopgging put out by some simiangrid connectors. Please re-enable if needed.
2011-01-18 00:10:34 +00:00
6e58996b4d
refactor: remove redundant null checks
2011-01-17 23:57:50 +00:00
4f8ba53f86
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 00:55:08 +01:00
81552099d6
Fix UnackedBytes client stack statistic as seen in "show queues"
...
Bytes were being wrongly added again on a resend
2011-01-17 23:45:25 +00:00
37837850d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 13:12:46 -08:00
aecaadd3bd
objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations
2011-01-17 13:10:09 -08:00
4bcee1dfb4
Revert "DEBUG DEBUG DEBUG"
...
This reverts commit 59c2cd04ba
2011-01-17 13:07:02 -08:00
59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
ddb4de139c
Change gesture activation to not quash any other flags
2011-01-17 21:22:32 +01:00
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
479d72ac97
Account for some component along the way lower-casing the HTTP header keys. (XFF header issue)
2011-01-17 11:37:39 -08:00
0aeb8981b2
Brute force debug for XFF issue
2011-01-17 11:19:20 -08:00
66f99ae267
More debug messages to help track the XFF header problem.
2011-01-17 11:03:46 -08:00
76f39d326e
Add a new ViewObjectInventory permission to decouple viewing from
...
+MOD status
2011-01-14 18:26:41 +01:00
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
a30bbcbb64
Temporarily reinstate prim counting in the update loop to make the production
...
systems run
2011-01-14 04:09:02 +01:00
fe2d9be0cf
Implement nonlocal god kicks and freezes
2011-01-14 03:35:45 +01:00
139e84c0b2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 01:01:02 +01:00
ddb5f4e44a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:01:50 +00:00
3fc5b6a8ec
Merge branch 'master' into careminster-presence-refactor
2011-01-13 19:53:44 +00:00
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
4eefdd5549
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:21:53 +01:00
69666be28c
Implement kicking, freezing and unfreezing users in the same sim via
...
profile god buttons.
2011-01-13 16:05:17 +01:00
c0134710f7
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 04:48:32 +00:00
d92069fb8b
Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.
2011-01-13 04:44:04 +00:00
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
705f4e1e4b
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 21:46:49 +00:00
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
f75a3ee762
Use ToString() rather than a cast (more robust)
2011-01-12 21:25:51 +00:00
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00:00
f59b55d930
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 17:40:21 +01:00
7f99a8c900
Fix direct item give permissions
2011-01-12 16:20:38 +01:00
d8fd777e13
Use ToString() rather than a cast (more robust)
2011-01-11 14:59:55 +01:00
2c6a410e90
Partial permissions fix for boxed items.
2011-01-10 22:02:22 +01:00
72048169c0
Taint SOGs the right way
2011-01-10 22:02:09 +01:00
e80bcc0049
Improved debug messages to track what is going on with the XFF header
2011-01-09 16:52:41 -08:00
0fabe0e5a5
Added more debug messages under the -verbose option.
2011-01-08 16:33:33 -08:00
35a2961ccd
Added a -v|verbose option to save iar.
2011-01-08 16:17:00 -08:00
9d9a170571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-08 15:50:25 -08:00
eab0951a59
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
...
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
ec22560045
Merge branch 'cmickeyb'
2011-01-08 13:33:52 -08:00
df7fb207a8
Moved the map tile processing used by the Simian Grid
...
Frontend into a separate region module. Configuration
settings added to the defaults ini file. Others may find
this useful for pushing map tiles to a separate server.
2011-01-08 13:33:07 -08:00
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
1ab9cd0997
Fix a couple of security issues
2011-01-08 13:51:34 +01:00
a1c5de0f94
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
2011-01-07 12:32:47 -08:00
02e661f8dd
Minor additional debug message.
2011-01-07 11:39:22 -08:00
8c0e156b4d
Make HG map search consistent with new syntax for link-region, i.e. http://foo.org . Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http.
2011-01-07 11:38:54 -08:00
c18bcf3d8d
A bit more frugal on the caller side of closing agents, now that the receiving end is async. No need for so much concurrency.
2011-01-07 10:25:49 -08:00
52f88f5739
Spawn a threadlet upon receiving requests to close agents. The operation may take too long, and we don't need to keep the caller waiting.
2011-01-07 10:04:39 -08:00
32a3f330ed
Canonicalize URL endings for the UserAgentServiceConnector.
2011-01-06 17:42:16 -08:00
fda56618e1
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
2011-01-06 16:17:43 -08:00
81587466e7
Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search.
2011-01-06 12:53:54 -08:00
21dedb573b
HG map tile fetch: handle cached images appropriately.
2011-01-06 12:48:28 -08:00
5b43f9cac4
HG bug fix. Must wait for client's UDP contact before getting scene presence.
2011-01-06 12:47:13 -08:00
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
d1b6b4d288
Fix god mode perms adjustment
2011-01-06 19:12:25 +01:00
d3ebf64369
Merge branch 'master' into cmickeyb
2011-01-05 15:01:53 -08:00
0b44e99730
comment out a couple simian debug messages
2011-01-05 14:51:11 -08:00
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
17ebe8fb77
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-05 07:14:45 -08:00
0c165bc421
Commented a verbose Debug message in LLUDPServer that got uncommented at some point.
2011-01-05 07:14:09 -08:00
4ac58093bf
Make the default for the very verbose XMLRPC groups debug setting false rather than true!
2011-01-04 23:23:42 +00:00
ba7a227763
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
2011-01-04 21:36:09 +00:00
fbde9b1136
Note to self: try to make only 3 things at the same time.
2011-01-04 11:33:15 -08:00
db55859125
Guard against null Animator.
2011-01-04 11:30:08 -08:00
6a5d52b4c8
removed the early return on agentupdates, this was debugging code
2011-01-04 09:12:32 -08:00
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08:00
d3987024d7
Merge branch 'master' into cmickeyb
2011-01-03 17:05:24 -08:00
5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +00:00
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
e15ab75d62
Add permissions hooks for object transfers
2011-01-03 19:56:56 +01:00
5432dfd53a
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-02 01:29:22 +01:00
04e450e2bc
Fix child agent scoping
2010-12-31 16:05:59 +01:00
5545b03168
Fix scoping for prim region crossings
2010-12-31 15:53:31 +01:00
6820deed34
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2010-12-31 15:45:08 +01:00
24a997eb7c
Add MessageKey to section Messaging, a key that prevents injection of
...
IM from external sources
2010-12-30 20:57:56 +01:00
df5e4a1e5b
Standardize the way WebRequests are made in the SimulationServiceConnector. Added
...
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
98769ed040
Merge branch 'master' into careminster-presence-refactor
2010-12-30 02:31:43 +00:00
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
3b50066ceb
Merge branch 'master' into careminster-presence-refactor
2010-12-30 01:40:38 +00:00
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
2cb2bff9b2
Implement SendPlacesReply
2010-12-30 00:31:59 +01:00
dbaaccf92a
Copying a ref type under lock doesn't dissociate it from the source.
...
Use a new list to do that.
2010-12-29 21:02:45 +01:00
88db69e017
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-29 21:18:28 +00:00
64209c9be1
Fix av/prim eject problem.
2010-12-29 21:13:49 +00:00
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
dfc0c8dca6
Remove the restriction on communication across scopes. This will allow
...
cross-scope users to IM each other.
2010-12-29 15:13:10 +01:00
915c0b17b0
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
2010-12-29 06:03:43 -08:00
94ed69b1da
Update SimianGridServicesConnector to work more like
...
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
6386dfd362
No need for these methods to be virtual now.
2010-12-27 16:26:29 -08:00
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
61b7ec5fb5
Fixing AbsolutePosition to correct llSensor in vehicles
2010-12-26 22:52:03 +00:00
f2dd324bc8
Fix linking link sets to rotated prims.
2010-12-26 20:42:47 +01:00
8186bf2525
Remove some code that was meant to fool the viewer into thinking SLT. It never
...
worked and it turned out the issues were really in the backend.
2010-12-26 07:29:23 +01:00
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
b17150c3e8
Fix the corner casse of stack overflow when logging out with attachments
2010-12-25 08:05:42 +01:00
0aeafc9919
Fix the recent stack overflow
2010-12-25 07:25:56 +01:00
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
75010e5e1c
Merge branch 'master' into careminster-presence-refactor
2010-12-25 00:04:46 +00:00
b16f4024db
Update child prim group positions in moving vehicles
2010-12-24 21:04:10 +01:00
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
135b012bbd
Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
...
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
42d44c00f3
Change the mute list parts of the client interface so that all data is provided
...
to the module
2010-12-24 03:46:57 +01:00
2e3d0fb276
Merge branch 'master' into careminster-presence-refactor
2010-12-24 02:23:26 +00:00
d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05:00
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
70bb542727
Merge branch 'master' into careminster-presence-refactor
2010-12-23 17:20:45 +00:00
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
efa8bd8eb3
Revert "reactivating some traces to track a dead thread"
...
This reverts commit d7df871f9f
2010-12-23 11:15:43 +00:00
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
98f0b4c72a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-23 08:14:43 +00:00
d7df871f9f
reactivating some traces to track a dead thread
...
seen @ NT and Otaku
2010-12-23 08:11:52 +00:00
d06456c8b2
Merge branch 'master' into careminster-presence-refactor
2010-12-23 02:57:45 +00:00
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
32cc569b00
Fix up some locking issues in task inventory. Don't use any prior versions in production!
2010-12-22 13:45:21 +01:00
cf37b3b943
Prevent a null ref when an avatar login doesn't go as planned
2010-12-22 03:25:30 +01:00
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
e9382c2939
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:09:12 +00:00
303c02133f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:00:01 +00:00
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
a70b597840
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:57:31 +00:00
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
da37ddff9f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:50:35 +00:00
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
4093e22833
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-21 20:57:52 +00:00
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
c9aa420c2d
Restore CM loking after core extract
2010-12-21 20:48:58 +00:00
2f84f2171f
Make prim inventories a bit more sane
2010-12-21 20:47:00 +00:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
5fccbe21d6
Update materials parameters.
2010-12-20 07:04:35 +00:00
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00:00
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01:00
7a78de8105
fix 'system.exception: unknown type in list.size: system.uint32'
2010-12-18 23:29:49 +00:00
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +00:00
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
d7622cbedc
Fix notecards that end with an embedded object causing an exception
2010-12-16 21:01:38 +01:00
835e4dbc2c
Add locks on m_killRecord without breaking things like justin did
2010-12-16 20:49:40 +01:00
aebc011f7b
Remove some spam from FreeSwitchModule
2010-12-16 20:12:18 +01:00
4719e925b8
Revert the locking changes in LLCLientView
2010-12-16 20:11:26 +01:00
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
d457b4c4b1
Merge branch 'master' into careminster-presence-refactor
2010-12-15 22:59:52 +00:00
62e66b17bc
Make sure the material is set on physical prims
2010-12-15 17:54:57 +01:00
ee1e725e39
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-15 08:18:02 +01:00
f8beeb1e93
Fix casts in llSetPayPrice
2010-12-15 08:15:12 +01:00
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
9d0339e8f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 16:04:46 -08:00
a4309578e2
Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
2010-12-14 16:04:28 -08:00
354f568508
Merge branch 'master' into careminster-presence-refactor
2010-12-14 23:58:45 +00:00
3643be1c97
Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents
2010-12-14 23:46:02 +00:00
92727ad596
minor: disable debug logging for previous test
2010-12-14 23:41:36 +00:00
8a5f9b91de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 23:39:21 +00:00
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
ff8ff773e7
Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag
2010-12-14 12:58:32 -08:00
10ae5454cb
Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time.
2010-12-14 12:16:51 -08:00
4357288a94
More on mantis #5270
2010-12-14 11:24:23 -08:00
5ce296e08d
Workaround to allow llHTTPRequest to POST data to Lighthttpd which doesn't support Expect: 100-Continue
2010-12-14 09:14:34 -08:00
55e04e6c68
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
2010-12-14 08:11:49 -08:00
cb51fc129e
Merge branch 'master' into careminster-presence-refactor
...
Also fix the failure to fire CHANGED_LINK on sit, which is different in our
code.
2010-12-14 12:12:27 +00:00
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00
4bdba0a487
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 21:36:08 -08:00
b41164b620
This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
2010-12-13 21:35:40 -08:00
e08da02a0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 00:12:17 +00:00
e62b3dba8a
reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code
...
There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
2010-12-14 00:11:41 +00:00
2a9f095071
Fix a small bug in ban list handling
2010-12-13 22:14:34 +00:00
6528fc5c64
Fix a small bug in ban list handling
2010-12-13 22:27:03 +01:00
9bd7f3b03a
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
d6803e6448
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 20:28:14 +00:00
a4588befb7
Changed logging level for message about failure to retrieve a map image from a linked region.
2010-12-13 22:00:34 +01:00
9a24c0b41c
Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
...
Configuration option AssetService in section [GridService] must be set to enable this functionality.
Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270 .
2010-12-13 21:20:48 +01:00
7538926292
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-13 20:20:02 +00:00
d2ff4ebf2d
Merge branch 'master' into careminster-presence-refactor
2010-12-13 20:19:10 +00:00
6b8d01d8c4
It turns out that the 1/2 sec burst for prims download is not a bug, but a feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid.
...
Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond."
This reverts commit 870bbcfc6c
2010-12-13 11:45:17 -08:00
6b374fa547
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:19:52 +01:00
fe6c655f70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 09:43:54 -08:00
870bbcfc6c
This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond.
2010-12-13 09:42:27 -08:00
d36b880022
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 11:13:34 +01:00
9f9af315ec
Correct Sensor axis for unattached daughter prims.
2010-12-12 23:26:58 +00:00
d3b081744e
Prevent objects that are worn from ground from vanishing from the scene
2010-12-12 22:12:50 +01:00
63353a0687
Fix a perms issue when wearing an object from inworld
2010-12-12 21:24:00 +01:00
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
663a626a6f
Apply the useful part of diva's patch that was skipped
2010-12-12 08:57:26 +00:00
28022a9198
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:22:50 +00:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
4d16ecf889
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-11 17:07:08 -08:00
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
95a915efd8
Fix border fence for physicals. Fix llRotLookAt() for Vehicles.
2010-12-11 21:04:03 +00:00
69538d14d4
More OSSL function name normalization, this time for osParcelSetDetails.
2010-12-11 11:41:45 +01:00
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
2010-12-10 23:32:50 -08:00
18b10fab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 23:16:47 -08:00
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08:00
b46de6e025
Remove the restriction that you have to be logged in when loading/saving iars
...
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
711db25dfa
Allow floats in the list for llSetPayPrice and silently convert them to int,
2010-12-11 03:31:57 +01:00
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
b512ecd1dc
Normalization of OSSL function names.
...
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor
The functions that do not comply to the standard give a warning when used but work normally otherwise.
The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".
The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
2010-12-10 12:40:12 -08:00
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
6f37290f4c
Adjust hypergrid console commands to latest changes.
2010-12-10 17:48:45 +01:00
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -08:00
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +00:00
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
f28dc77ab4
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 02:01:41 +01:00
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
80b84e4bad
Prevent sending of attachment data to any client if the attachment
...
is not actually attached to any avatar. Another stab ad fixing "HUD hair"
2010-12-08 00:08:14 +01:00
b9f54fca5d
Allow TPing multiple people in the friends list in one go.
2010-12-07 23:01:42 +01:00
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
...
Prevents empty instances from hanging around when Mono.Addins messes up
2010-12-07 01:07:13 +01:00
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
835103af82
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 21:50:48 +00:00
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
4b979362e9
Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims
...
Removed some unneccessarily wordy core comments
2010-12-04 14:41:57 +01:00
96446adfa4
Monitor the UUIDs used to create and update wearable assets. Reject any changed
...
texture that is not present in the user's inventory full perm.
This will prevent "UUID snatching", a copybot-type of attack that can cause
clothing makers to be forced to destroy and replace legit items in order to
invalidate the copies.
2010-12-04 07:06:30 +01:00
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
f41dfbabc8
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 05:01:44 +01:00
349767f8a2
Merge branch 'master' into careminster-presence-refactor
2010-12-04 04:25:39 +00:00
bab6b6cd87
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 04:36:44 +01:00
da91a2ab7e
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:33:14 +01:00
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
8e3bacc691
When linking something, immediately persist the linked set.
2010-12-03 23:06:44 +01:00
bf695cccba
Fix spurious Av move when clothing item worn or removed.
2010-12-03 18:32:58 +00:00
60b055de4c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-03 19:04:59 +01:00
4407c4700f
Fix status responses in remote admin
2010-12-03 19:02:42 +01:00
8741676bc3
Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region.""
...
This reverts commit 6c01ebb875
2010-12-03 18:32:03 +01:00
b940925173
Improve health reporting
2010-12-03 07:27:29 +01:00
e913e1690e
Fix health reporting. This will now actually monitor the threads properly
...
and not just the http server. It will also restart a dead heartbeat.
2010-12-03 07:16:06 +01:00
ce1aedf474
Add a missing interface memeber to the new HG stuff
2010-12-03 07:04:07 +01:00
6c01ebb875
Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region."
...
This reverts commit 2827deffe8
2010-12-03 04:39:51 +01:00
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
ec01936d38
Change the way sim health reporting reports sim startup
2010-12-03 02:37:08 +01:00
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
5246d98b8d
Stop LLUDPServer sending updates after object deletes by always queueing deletes
...
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
26569a7cd0
minor: add some method doc
2010-12-02 02:01:01 +00:00
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
ab2adaf341
Various bug fixes for appearance handling
2010-11-30 16:20:43 +01:00
0218845c2e
Prevent the restart module from barfing if it's not configured
2010-11-30 15:40:50 +01:00
b08cc63003
Change inworld restart to use blue boxes rather than notices to match SL
2010-11-29 21:45:03 +01:00
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
04ce7de5ed
Fix the build break
2010-11-29 01:15:30 +00:00
836b73f765
Fix the build break
2010-11-29 01:15:02 +00:00
0acfe80f21
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:37:21 +00:00
4d104cf6fe
Make gatekeeper's address check case-insensitive.
2010-11-28 23:35:38 +00:00
5aeb83125a
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:30:55 +00:00
2bee150aac
Implement health monitoring of the packet receiving and sending threads
2010-11-28 20:45:03 +01:00
0f1fc79994
Implement god summons
2010-11-28 20:14:58 +01:00
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
4765fd9cd0
Remove hard limit on prim owners. The new LibOMV autosplits packets to
...
prevent overflow
2010-11-27 19:31:18 +01:00
2412b3cb4a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-27 13:07:23 +01:00
0b41606e73
Instrument TI Dictionary to finally find that pesky script-caused deadlock
2010-11-27 13:02:51 +01:00
d71d4f96e3
Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW
2010-11-27 10:59:14 +01:00
947d730b56
Make gatekeeper's address check case-insensitive.
2010-11-27 09:18:39 +01:00
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
35c6bba6d7
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:29:01 +00:00
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
a8a8fb6e13
llVecNorm nant test
2010-11-27 01:29:55 +00:00
e0866faacc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-27 01:27:46 +00:00
a1ab2a2244
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:25:02 +00:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
385a6c4b34
Convert the scope id in the im session id to a URL variable. Fixes offline
...
group notice attachments not working
2010-11-26 23:20:43 +01:00
7c02d5cec5
Another attempt at fixing failing test for creator info.
2010-11-26 23:04:31 +01:00
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
0bc5ffbe96
Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177 .
2010-11-26 11:50:51 +01:00
cccfd1db34
Add marker files to the restart module so external scripts can be used to
...
kill a process that hasn't restarted properly
2010-11-26 03:21:51 +01:00
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
33c023bf6a
Allow group lookup during tp / login to make restricting parcels to group
...
work.
2010-11-25 21:22:22 +01:00
ee9aca9c52
Add the ability for gods to impersonate users. For this, bit 6 needs to be
...
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
2010-11-25 20:34:55 +01:00
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
c14592d4ba
Export the module interface for restart
2010-11-25 04:16:34 +01:00
efb03f6f99
Fix a bug caused by leftover code
2010-11-25 03:59:57 +01:00
e74b0deb4e
Fix up remote controller.
2010-11-25 03:43:23 +00:00
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +00:00
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
1522567920
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:37:50 +01:00
eb9d7bff6c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-25 01:25:56 +00:00
2c1c04119d
Merge branch 'master' into careminster-presence-refactor
2010-11-25 01:24:32 +00:00
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
a47fb93b74
Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim
2010-11-23 23:48:52 +01:00
a4bf6c5343
Attempt at fixing failing test.
2010-11-23 07:44:42 -08:00
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
2527aeb40c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-23 14:03:52 +00:00
61a49ec4a8
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
45b08a9ce3
Fix more potential nullrefs
2010-11-23 14:02:20 +00:00
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
ba2bf78dcf
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230 .
2010-11-23 11:45:12 +01:00
8d79a39d5b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-23 04:27:06 +00:00
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
4a54b3318b
Fix more potential nullrefs
2010-11-23 00:31:09 +01:00
bbc291dfdf
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
2010-11-22 23:07:30 +00:00
34b13a4765
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
2010-11-22 22:54:13 +00:00
571becefb6
Fix some crashes caused by the addition of the CreatorData column
2010-11-22 23:31:29 +01:00
e1c72cedb3
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
...
This event used to trigger only when the scale was changed with a script.
2010-11-22 19:38:44 +01:00
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
506192e466
Make an invalud key string in llTextBox and llDialog non fatal to avoid
...
breakinf sloppily made no-mod scripted items.
2010-11-22 15:16:28 +01:00
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
54d1d6d917
Fox case on a method
2010-11-22 14:32:51 +01:00
87f30709a2
Merge branch 'master' into careminster-presence-refactor
2010-11-22 14:14:45 +00:00
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
8466ada8e0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-22 00:46:37 +00:00
0fec29c849
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-21 17:19:45 -08:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
7e9a3019ac
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:55:11 +01:00
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
c85e6bc36d
Add the remote connector for freeswitch config retrieval
2010-11-21 23:42:52 +00:00
5f8a0f3d1f
Add the remote connector for freeswitch config retrieval
2010-11-21 23:41:56 +00:00
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
a7174cecdd
Remove username and password from the publicly accessible FS config
2010-11-21 22:45:04 +00:00
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
2b0ef9ad1d
Implement a method to allow regions to query the gridwide Freeswitch
...
configuration from ROBUST
2010-11-21 22:17:25 +00:00
af8c8197ab
Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!?
2010-11-21 13:29:20 -08:00
ed5f91c638
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:29:17 +00:00
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
51343caeb5
Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work.
2010-11-21 13:27:03 -08:00
83a427a8f9
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:18:03 +00:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
f1151f20dc
Fix global region coordinates that are delivered by llRequestSimulatorData.
...
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
f49e32bfaa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-20 02:34:27 +00:00
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00:00
8f1a79420b
Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
f3e4000a55
Send media and other parcel data to client on login. Makes streams visible
...
right away and starts media.
2010-11-18 13:26:35 +01:00
47f0468995
Send parcel data upon becoming root. This will make streams play and build
...
flags be set properly
2010-11-18 04:18:43 +01:00
095e3aae67
Allow llDialog without any buttons and add the automatic OK button as it is
...
in SL.
2010-11-18 01:11:11 +01:00
859234f963
small refactor: reuse existing commandLine string rather than calling cmdline.ToString() again
2010-11-17 23:50:23 +00:00
c072a9cfb3
save all lines to history, not just those which turn out to be valid comands. does not store passwords
...
also, blank lines are not stored to history
this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
2010-11-17 23:34:39 +00:00
af0deff7e9
Make "show queues [full]" behave like "show users [full]"
...
Now, "show queues" only shows root agents. "show queues full" will show child agents as well
2010-11-17 22:55:20 +00:00
c4f3175e17
add "Unacked bytes" column to "show queues"
...
This should show the number of bytes sent to the client that it has not yet acknowledged.
2010-11-17 22:55:19 +00:00
2a17c39dfe
Fix "show queues" console command
...
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
2010-11-17 22:55:19 +00:00
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +00:00
3bc9c1adb4
Merge branch 'master' into careminster-presence-refactor
2010-11-17 18:21:35 +00:00
0d72d77629
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-17 18:20:41 +00:00
43c270b536
Fix gesture and viewer preview sounds not playing
2010-11-17 18:20:24 +00:00
2e5ae1b013
Fix gesture and viewer preview sounds not playing
2010-11-17 17:54:32 +01:00
80d3998001
Recalculate prim counts when a parcel is deeded
2010-11-17 17:54:03 +01:00
393c9c9046
Add osUnixTimeToTimestamp()
...
This allows an input unix time to be converted to an llGetTimeStamp() format.
Thanks Thomax.
2010-11-17 01:45:47 +00:00
b38a1594c1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-17 01:28:46 +00:00
390c3a3b6f
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:18:35 +00:00
0049ec16f5
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:26:07 +01:00
c4eb430ad2
Merge branch 'master' into careminster-presence-refactor
2010-11-16 21:15:15 +00:00
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
d4d45c3acb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-16 20:47:29 +01:00
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
c5d78c723b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-16 19:18:43 +00:00
56bd42b438
Fix osTeleportAgent for hypergrid destinations.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 15:23:45 +00:00
50202bab7c
Add osTeleportOwner.
...
This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map.
The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access.
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 13:43:27 +00:00
e7e3c74fb7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-16 10:22:15 +00:00
5329e3b9b7
Can't detach an object from within the script thread because it will throw. Use FireAndForget for that.
2010-11-16 01:36:26 +00:00
98ba079e95
Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory.
2010-11-16 01:35:16 +00:00
c2ac5dc358
Can't detach an object from within the script thread because it will throw.
...
Use FireAndForget for that.
2010-11-16 01:37:44 +01:00
7a9c57a81e
When detaching a scripted item, always consider it modified. Script states
...
will have changed and for real usability, we need to save it. It bloats
assets, but that can't be avoided.
2010-11-16 01:35:45 +01:00
0f152bfe8c
Diva needs a spanking! Serializing OldItemID breaks script state
...
persistence in agent inventory.
2010-11-16 01:33:24 +01:00
98f29a47c0
Do not include hyperlinks in a random region search during a login.
...
Before a random region is chosen, available fallback regions are used for the login.
2010-11-13 00:40:03 +00:00
1e7334d985
provide avatar name in log if an exception ends up at the top of an async packet processing stack
2010-11-12 23:20:07 +00:00
00b0f521fa
Add PARCEL_DETAILS_ID to LSL
2010-11-12 01:16:14 +00:00
b2aeea66e3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-11 04:51:05 +00:00
9462a1861b
Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying.
2010-11-11 04:49:47 +00:00
bfc128529c
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:20:19 +00:00
aace455249
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:22:55 +01:00
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
b68f701c00
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-09 23:55:19 +00:00
fa64f2e56e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:54:08 +00:00
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
d206721e2f
Add option SeeIntoBannedRegion to allow band to act like SL, where you can
...
see in but not enter. Defaults to false, so no change.
2010-11-09 22:41:40 +01:00
dfe11566f4
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 20:18:36 +01:00
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
15da52d73a
Prevent temp-on-rez prims from being persisted
2010-11-08 19:00:03 +01:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
df0787f5cf
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:08:02 +00:00
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +00:00
8a97d58f09
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:05:07 +00:00
6056ae8d88
Fix merge artefacts
2010-11-08 02:58:33 +00:00
18b27408d6
Prevent plants from being treated like dropped attachments and removed
...
from the sim.
2010-11-08 02:39:06 +00:00
4f6dd8bda3
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
2f58d56137
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-11-08 02:37:28 +00:00
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
2317b6767b
Add a method to delete left over / dropped attachments
2010-11-08 02:36:51 +00:00
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
5a3cd9f1d0
Decrease min search length to 2 chars for map search.
2010-11-07 16:08:41 +01:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
4db60a5a40
Fix the inventory transfer module to not cause duplicated text IMs
2010-11-05 15:24:08 +01:00
7844872067
Fix merge artefacts
2010-11-05 14:46:13 +01:00
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
1c8d19d714
Delete existing presences for a user ID when they log in again.
...
WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.
2010-11-05 13:31:45 +00:00
ddd3c6824a
Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
...
This reverts commit 40e05f4109
2010-11-05 14:27:53 +01:00
f985775962
Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
...
This reverts commit 91b1d17e5b
2010-11-05 14:27:14 +01:00
6bac92db80
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-05 13:34:54 +00:00
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
893915ce0b
Fix child prims returning after being unlinked and deleted where the root is
...
not deleted
2010-11-04 21:09:59 +01:00
82e534a029
Fix avatar to avatar inventory gives across servers
2010-11-04 19:07:43 +01:00
b8924167e0
Fix creation of a duplicate physics actor on chained drag-copy operations,
...
the main cause for "ghost prims"
2010-11-04 10:37:39 +01:00
c2bd6ccdb8
Fix playing sound from HUDs
2010-11-03 23:20:30 +01:00
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +00:00
6c3b7617b0
Add lsClearWindlightScene() to the lightshare module to remove WL settings
...
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
2010-11-03 02:04:17 +00:00
c25f84e31c
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
so it reflects the prior default. We are not in the habot of changing default
behavior without good reason and making localhost the default would break
most current use cases.
2010-11-03 01:13:01 +00:00
1f77f05f02
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
636ca6218d
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
so it reflects the prior default. We are not in the habot of changing default
behavior without good reason and making localhost the default would break
most current use cases.
2010-11-03 01:11:04 +00:00
d5d0e81df2
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
e9ec187746
Merge branch 'master' into careminster-presence-refactor
2010-11-03 00:48:18 +00:00
57eabe9d46
Actually calculate the height before setting it, this isn't done automatically
...
on incoming transfers in all cases.
2010-11-03 00:47:22 +00:00
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
797e461ef9
Merge branch 'master' into careminster-presence-refactor
2010-11-02 23:41:13 +00:00
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
43ac44b028
Fix default club feet
2010-11-02 21:41:27 +00:00
5eeabb8b4b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 21:29:02 +00:00
78a0ed3ff9
Fix sitting and standing up
2010-11-02 21:28:24 +00:00
4fdab71c8d
Add support for cross-domain AJAX requests to REST console.
...
Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code.
The WifiConsole uses this functionality with grid mode.
2010-11-02 14:12:25 -07:00
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
e327e990f5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 19:55:27 +00:00
63ffdcf53a
Try to not make avatars switch outfits
2010-11-02 19:55:05 +00:00
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
ed7959ddfb
Thanks Snoopy for a patch that addresses Mantis #0005165 : osSetDynamicTextureURL crashed region server
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-11-02 02:35:56 -07:00
2bce1716af
Fix HypergridLinker.Check4096()
...
Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
2010-11-01 08:01:31 -07:00
12d61d1ef5
Merge branch 'master' into mantis5110
2010-10-31 20:50:39 -04:00
f15f0ab59b
Removed a couple of very verbose debug messages.
2010-10-31 12:11:30 -07:00
0a56cfbfd5
* better semantics for link-region command
...
* actually parse name for new link-region command
2010-10-30 22:51:52 -04:00
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
48f6d47744
Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.
2010-10-30 12:30:03 -07:00
623cee1ffc
Move physics actor creation to after SetHeight to try and prevent
...
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
09bf9d5fca
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
2010-10-30 02:26:48 -04:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
594f23ff22
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Services/GridService/HypergridLinker.cs
2010-10-29 23:46:53 -04:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
d0895a4a3a
On first login, Ruth is back now. Strangely, inventory items are created for
...
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
2010-10-30 03:28:59 +01:00
adef6b04cb
Logins work now, but avatars are green ugly gnomes.
2010-10-30 02:52:59 +01:00
ba6f651b06
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 02:26:18 +01:00
f9227977f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-30 03:07:45 +01:00
45220a6954
minor: remove some old commented out code
2010-10-30 03:01:40 +01:00
ff7da2082d
This commit fixes all the appearance related null refs. Still can't log in,
...
client displays a blank error box.
2010-10-30 02:25:25 +01:00
343c894658
Set async_packet_handling = true by default
...
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
ade71c9ed7
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
2010-10-30 01:32:56 +01:00
46362cd1c0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:58 +01:00
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
09705514ff
tweak a few more scene presence logging messages for consistency
2010-10-29 23:52:25 +01:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
25e19ba7e9
add timing report to CompleteScenePresence for diagnostic purposes
2010-10-29 23:03:11 +01:00
bcd784b316
for now, comment out some older or redundant log debug lines to make diagnostics easier
2010-10-29 21:49:26 +01:00
f19816aeb9
Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics
2010-10-29 21:38:26 +01:00
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
49fa7e91b9
Clean up some cruft from the last commit. Re-add the initial update
...
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
2010-10-29 20:17:59 +01:00
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
dbd1a68b58
Fix a LSL issue and a prim naming issue
2010-10-29 20:35:06 +02:00
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
2010-10-29 20:34:53 +02:00
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02:00
7b0d643999
HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
...
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
a51a545cb9
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-10-28 13:24:45 +01:00
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
05dbe4f2c4
Merge branch 'master' into careminster-presence-refactor
2010-10-27 20:49:27 +01:00
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
9132e251aa
Made the check for texture assets asynchronous. This is one part of
...
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
3113cc9129
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-25 01:24:42 +01:00
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
cf78f3fae3
Comment repeated add and remove of avatars from the physical scene. It's no
...
longer needed.
2010-10-25 00:53:38 +02:00
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
dd7f9ed7bf
Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoe
...
scripts.
2010-10-25 00:33:34 +02:00
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
61137eac22
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:19:48 +02:00
2f0a3391ee
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-24 17:21:16 +02:00
5f266fd571
Change the results from llGetPrimitiveParams to be the same as SL for
...
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
2010-10-24 17:18:21 +02:00
627d1a42fe
Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object.
2010-10-23 20:39:41 -07:00
d0c707209a
Prevent an exception if a string passed into llXorBase64StringsCorrect is not
...
a base 64 string. Return the empty string in this case.
2010-10-23 22:40:56 +01:00
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
9a78281f82
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:22:23 +01:00
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
2010-10-22 23:35:01 +01:00
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
2010-10-22 23:34:53 +01:00
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
2010-10-22 23:34:44 +01:00
cddcb53b17
Revert "* remove some spurious debug info"
...
This reverts commit 017b83d0a3
2010-10-22 23:34:37 +01:00
d58967be58
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 18:33:59 -04:00
6d7ce63085
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 18:33:55 -04:00
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
607c07b4aa
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 18:33:41 -04:00
772dbf59f3
slightly simplify oar control file loading code
2010-10-22 18:33:35 -04:00
460b9fffe5
write IAR control file first in the archive rather than last
2010-10-22 18:33:32 -04:00
e06acae965
Allow region modules to know which agents actually receive chat
2010-10-22 18:33:19 -04:00
481a44104e
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-22 18:33:10 -04:00
004b395d12
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-22 18:27:49 -04:00
170c5d183b
Remove a bit of dead code relating to ObjectCapacity
2010-10-22 18:27:40 -04:00
753137e9ad
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-22 18:27:28 -04:00
6049e548a5
Skip empty strings in ParseString* functions
2010-10-22 18:27:12 -04:00
9fa915bdef
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:20:18 +02:00
c3ddf46188
Prevent database lookups on every avatar movement when land is set to group
...
access. Fixes a massive performance degradation.
2010-10-23 00:18:56 +02:00
700f4ddea4
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 22:55:07 +01:00
cfbaad3669
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 21:28:10 +01:00
1064e743be
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 21:12:22 +01:00
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
199b61f1b2
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
301a926015
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 13:29:59 +01:00
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
e7f184345e
minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable
2010-10-22 01:52:19 +01:00
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
529fb58b7b
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -07:00
28c4dd7931
Merge branch 'master' into careminster-presence-refactor
2010-10-21 20:26:29 +01:00
fe99f194ad
Deleted a verbose and unneeded log message.
2010-10-21 12:00:30 -07:00
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
fa7da00cc3
COnvert some funky K&R notation to proper (MS) style
2010-10-21 09:35:33 +01:00
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01:00
f8a47801ee
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-20 20:43:08 -07:00
9038218c2d
fix combining of multiple physics submeshes
2010-10-20 20:39:05 -07:00
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
335f2ddad2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 20:26:37 -04:00
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
a7acb650d4
Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours.
2010-10-19 22:26:07 -07:00
9f975ad5aa
* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
2010-10-20 01:23:54 -04:00
087cb951e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 00:43:29 -04:00
edce4e9c67
* This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool.
2010-10-20 00:40:05 -04:00
8731c2be11
It looks like Vector3s also got written down in lower case at some point in time. Added code to account for that.
...
17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838.
2010-10-19 15:16:29 -07:00
8acac3d07f
Another take related to the previous commit.
2010-10-19 15:07:15 -07:00
3b2d9a9939
Added code to quaternion deserialization to try to cope with an exception seen in Wright Plaza related to SitTargetOrientation.
...
17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064.
2010-10-19 14:37:03 -07:00
684449f783
Added TextureAnimation and ParticleSystem to serialization.
2010-10-19 00:04:02 -07:00
b2c1a1c9bd
* This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization.
...
* You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
2010-10-19 01:53:56 -04:00
158e43d4fd
* Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment.
2010-10-18 23:47:35 -04:00
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
37a6be7ca9
Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it.
2010-10-19 02:20:47 +01:00
5dd372edc4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:12:36 +01:00
99388ce610
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:08:50 +01:00
478b44f231
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
...
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
b9bef50852
Display more information when xmlrpcgroupsserver comms fails
...
Improve debugging messages
2010-10-19 02:04:14 +01:00
43a4b7b735
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:23:25 +01:00
8853c21763
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:22:31 +01:00
e0a02d6ca3
Merge branch 'master' into careminster-presence-refactor
2010-10-19 00:52:35 +01:00
5b29b975ee
Comment a spammy debug message in the serializer
2010-10-19 00:51:04 +01:00
7de30cc57b
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:59:00 +01:00
ce3594f7f2
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:58:04 +01:00
551015db63
Alphabetize results on region search by prefix matching
2010-10-18 20:29:00 +01:00
78a6e5489b
Fix merge issues
2010-10-18 20:50:16 +02:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
e48ac93803
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-18 19:08:55 +01:00
2be93066da
Bump migration version on LastSeen field so it is actually run
2010-10-18 19:08:26 +01:00
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
6df4ca7de1
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-17 10:42:04 -07:00
7038f2b406
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
2010-10-17 10:41:38 -07:00
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
06b61b68c7
Adding osFunctions for light projection
...
Set the projection parameters in the host prim ...
osSetProjectionParam(bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Set the projection parameters in a target prim ...
osSetProjectionParam(ikey target uuid,
bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Threat Level very high
Signed-off-by: Melanie <melanie@t-data.com>
2010-10-17 09:52:12 +01:00
9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
e6d0fb0b0e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-16 10:51:44 +02:00
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02:00
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
edc31adf95
Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all
...
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16 07:09:13 +01:00
e41b23a1a4
change --old-guids switch on the save oar command line to --version=<x>
...
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
2010-10-16 05:38:44 +01:00
3df8d8ff76
Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle
2010-10-16 04:59:51 +01:00
1bd4219078
save oar control file first rather than in the middle so that it's the first thing we come accross on load
...
this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now
2010-10-16 03:52:11 +01:00
fe4e6ff811
Fix test break - TestSerializeXml2() still requires old-guids option
2010-10-16 02:38:46 +01:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
1499607215
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-10-15 17:27:19 -07:00
e039a8c8c2
UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims.
2010-10-15 15:43:06 -07:00
dd1058e6b3
Adding projected light filters to prim propeties
...
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 09:46:49 -04:00
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:56:08 -04:00
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
41ce392d9b
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
2010-10-14 09:05:46 -07:00
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
6d99f0c627
* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'
...
* At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
2010-10-14 09:34:37 -04:00
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
9c5f8a6802
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 03:23:37 -04:00
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
6ac6ca057d
Kill some magic numbers in the caps module
2010-10-14 07:28:20 +01:00
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
aa60c4b129
fix build break
2010-10-13 22:18:57 +01:00
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01:00
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01:00
eeac2a9e6a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-13 18:41:52 +01:00
ccd5610997
Correctly update the LastSeen field
2010-10-13 18:41:09 +01:00
01728fb19e
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
...
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-10-13 18:40:33 +01:00
d890390ecf
Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements.
2010-10-13 10:38:34 -07:00
54a3b8e079
New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet.
2010-10-13 08:16:41 -07:00
3eb68c319e
change default next owner persm to mod/trans to match SL.
2010-10-13 08:24:18 +02:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
0806d03780
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-10 22:08:54 +01:00
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
30f926aab6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-10 22:07:51 +01:00
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
2804c97a39
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:06:47 +01:00
c2971a6398
Add group invites to the list of messages that get offlined
2010-10-10 20:15:02 +02:00
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01:00
96080dc492
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-09 01:05:05 +01:00
ed161020e2
minor: remove some mono compiler warnings
2010-10-09 01:46:29 +01:00
211ea5d521
Limit formatting of local console output to actual logging messages.
...
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
ff49a21eca
Fix a security relevant issue with take / take copy
2010-10-09 01:02:57 +02:00
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
4a0911bdbd
Guard against locking a nullref to avoid build break
2010-10-08 19:19:07 +01:00
5dcbbb726a
Change the order of actions to address a possible nullref
2010-10-08 18:40:13 +01:00
52dd547863
Make SendKillObject send multiple localIDs in one packet. This avoids the
...
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02:00
4adada6fe4
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-07 23:47:39 -04:00
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
ba0afa53d3
Implement rezzing coalesced objects
2010-10-07 05:12:39 +02:00
9a5d0984a5
Fix autoreturn to not return zero objects
2010-10-07 02:16:36 +01:00
2db0ac74c7
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.
2010-10-07 01:13:17 +02:00
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
42f76773a1
Plumb the path for multiple object deletes
2010-10-06 19:59:30 +02:00
ca50f6a82c
Merge branch 'master' into careminster-presence-refactor
2010-10-06 05:45:29 +01:00
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
9a1c8db443
Convert worldview to GET
2010-10-06 05:17:31 +01:00
1a47ec082e
Convert worldview to GET
2010-10-06 05:15:47 +02:00
b7586806cd
Merge branch 'master' into careminster-presence-refactor
2010-10-06 03:52:57 +01:00
623f57deb5
Change the URL /worldview to /worldview/<region id> to support multiregion
2010-10-06 03:51:55 +01:00
752b6a8764
Convert the BMP to a JPEG image and return it. This should be testable.
2010-10-06 03:40:55 +01:00
abfcd168fc
Add the parameter plumbing and image generation
2010-10-06 03:32:01 +01:00
17316170a5
Add WOrldView request handler and plumbing
2010-10-06 03:03:10 +01:00
7d62ab6a9e
Fix incorrect class name
2010-10-06 02:16:42 +01:00
ce89f08f6b
Add WorldView module skeleton
2010-10-06 02:06:50 +01:00
c97398575c
Convert the map image modules to new style modules
2010-10-06 01:42:18 +01:00
84cf0ffbf1
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 20:06:27 -04:00
593fc5c87a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 19:45:37 -04:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
7e6a047769
Remove defunct sirikata client stack
2010-10-06 00:20:41 +01:00
5d61323192
Add the view generating method to the image generator interface
2010-10-05 23:49:21 +01:00
b424af6187
Revert an accidental default value change
2010-10-05 23:06:29 +01:00
eb491d2c36
Patch to allow other cam angles. Not complete. Thanks, Antont.
2010-10-05 22:56:20 +01:00
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
ba0a19c228
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 02:12:35 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
eb17d581d3
Make windlight set the default environment on start
2010-10-05 01:54:15 +01:00
e55e93c994
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:28 +01:00
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01:00
37231e0941
Made the home agent handler check for xff if behind a proxy.
2010-10-03 21:21:02 -07:00
934ae03d44
Made the Gatekeeper proxy-able.
2010-10-03 20:35:26 -07:00
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
2010-10-03 20:01:59 -07:00
f89dd85f68
Fix a comment marker
2010-10-04 00:17:48 +01:00
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
90f9b7b7c4
Fix line endings
2010-10-04 00:37:18 +02:00
50b03d08a8
Add linden prim renderer and update libOMV
2010-10-04 00:04:42 +02:00
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
48988bf4e9
Merge branch 'master' into careminster-presence-refactor
2010-10-03 22:38:32 +01:00
511751a733
I really have to say it again and again: e.Message is NOT enough data for
...
troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must
be used.
Fix one more instance of that cr.p
2010-10-03 22:36:27 +01:00
5910be236f
Merge branch 'master' into careminster-presence-refactor
2010-10-03 16:52:27 +01:00
189cda1c3d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-03 16:51:41 +01:00
0b13cfa4dd
Port ExecutingDirectory from omfOS Util class.
2010-10-03 16:50:50 +01:00
4f70ac018b
Adapt to core changes
2010-10-03 16:40:11 +01:00
27340f616e
Addign the new / renamed files for previous commit
2010-10-03 16:34:55 +01:00
ab4be3ffdf
Initial port of the Warp3D map tile renderer
2010-10-03 16:34:17 +01:00
0133619af2
Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.
2010-10-02 17:02:02 -07:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
662976b602
Merge branch 'master' into careminster-presence-refactor
2010-10-02 20:12:36 +01:00
6fc1ceb2ee
So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not.
2010-10-02 20:11:43 +01:00
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51:43 +01:00
87c6386884
Reapplying the parts of the prior revert that were not derived from the
...
original patch
2010-10-02 18:47:26 +01:00
b01020b84a
Revert "Forward-port 0.6 fix"
...
This reverts commit 90b51dc7d6
2010-10-02 18:45:48 +01:00
f220a2c5eb
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:24:16 +01:00
b40c91777c
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:19:30 +02:00
9f7f266f58
Replace CalculateMass with a better, contributed version
2010-10-02 00:18:52 +02:00
2427e16b42
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-01 05:42:42 +01:00
ffc1123ca5
adding -logconfig to Robust.exe
...
Adding -logconfig to Robust.exe. will still process the
-logfile option, as before. No options given, the value
"Robust.log" will be written in the ./bin directory
2010-10-01 05:42:18 +01:00
7ad1b60eca
Enforce region agent limit as set in estate tools
2010-09-30 20:01:55 +02:00
9c6a591ad0
couple fixes to enable profiles in simian connector
2010-09-30 09:59:53 -07:00
521e2c8355
Merge branch 'master' into careminster-presence-refactor
2010-09-30 16:01:45 +01:00
eb58d91098
Prevent dropping someone else's attachments
2010-09-30 15:57:52 +01:00
90b51dc7d6
Forward-port 0.6 fix
2010-09-30 15:52:33 +01:00
29646bcf67
Fix an inventory fetch issue
2010-09-30 02:52:35 +01:00
ac7a4a7d38
Fix an inventory fetch issue
2010-09-30 02:47:07 +02:00
9522881404
Fix a potential key collision
2010-09-30 02:46:47 +02:00
08ee7a0e51
Actually log users out (call LogoutAgent) in the SimianPresenceServiceConnector when LoggedOut() is called
2010-09-29 15:14:13 -07:00
1255c7ceb6
Cleanup: Removed an unreferenced variable from ActivityDetector.cs
2010-09-29 14:39:13 -07:00
b6e0563ad7
Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior
2010-09-29 14:34:02 -07:00
9b7c99f0cf
Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now
2010-09-29 14:24:32 -07:00
3d75e9addd
Lock the iteration over the inventory items when saving script states
2010-09-28 02:22:32 +02:00
841c84831f
Try to prevent threading issues in SP.SetAppearance by locking it
2010-09-27 19:34:16 +02:00
5b2aa02fd9
Merge branch 'master' into careminster-presence-refactor
2010-09-27 03:48:15 +01:00
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
41051b3cc6
Prevent setting arbitrary groups on your objects.
2010-09-27 02:13:22 +01:00
8e547d3491
Prevent setting arbitrary groups on your objects.
2010-09-27 02:11:55 +01:00
c2a4bdb2fe
Fix build break
2010-09-27 01:40:29 +01:00
296cf04ce6
Merge branch 'master' into careminster-presence-refactor
2010-09-27 01:32:06 +01:00
84ab4742c8
Quash the region ID on intersim messages. That prevents people from determining
...
another avatars location
2010-09-27 01:31:17 +01:00
aaa4cb64a4
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-27 00:34:30 +01:00
1f7d68e555
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:30:26 +01:00
34e8bf45b6
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:29:27 +01:00
9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +01:00
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
dc49057c8a
Consistency patch: use Path.Combine() instead of + and eliminate the need
...
for a trailing slash on exports/
2010-09-26 20:03:00 +01:00
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
Adding ability to place script engine assemblies outside
the codebase directories.
Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"
Signed-off-by: Melanie <melanie@t-data.com>
2010-09-26 02:30:46 +01:00
0080f28f1d
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:57:53 +01:00
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
83b16612ce
Experimental locking of taint processing
2010-09-25 05:57:08 +02:00
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
6325fa515d
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
...
If a separate UUID parameter is better for the future then this can be added later on.
2010-09-25 00:51:40 +01:00
b366ad5012
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-25 00:00:00 +01:00
5bcf9ae2f9
If the uuid gatherer fails to find the asset containing gesture metadata, then simply return rather than generating an exception
...
This matches existing behaviour, though better diagnostics for missing assets may be good later on.
This addresses http://opensimulator.org/mantis/view.php?id=4977
2010-09-24 23:58:37 +01:00
1c1f308052
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-24 23:48:52 +02:00
33bd4fe789
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
8dc59f5b59
Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functions per the LSL wiki.
...
Signed-off-by: Melanie <melanie@t-data.com>
This patch also fixes a large amount of trailing whitespace. While this is
beneficial, it should really be in a separate patch that fixes whitespace only.
Just good practice.
2010-09-24 16:25:14 +01:00
acd5bbdb71
* One more item for CSharpSqlite
...
* Hopefully this will enable mac people to use SQLite again
* Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up.
* There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after.
* The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
2010-09-23 01:45:54 -04:00
983c6a74b1
* Add CSharpSqlite to prebuild
...
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
41847e8fdf
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-21 04:03:40 +01:00
9feef34a81
Merge branch 'master' into careminster-presence-refactor
2010-09-21 04:03:14 +01:00
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
12f9b1df8c
Fix a typo
2010-09-21 03:57:09 +02:00
7229bc4fbd
Refactor script create permission into the perms module
2010-09-21 02:08:55 +02:00
51207c24a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:04:08 +01:00
192bcab987
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:01:07 +01:00
a85779e477
If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the scene, remove the old uuid reference from m_parts as well as adding the new one.
...
The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene)
Added unit test for this behaviour.
Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
2010-09-21 00:58:54 +01:00
9cf8795ecf
Fix a merge artefact that broke script state persistence in XAttachments
2010-09-19 22:53:05 +02:00
27d5976b87
* Tweaked the LocationTests for maximum coverage.
...
* Added more mundane tests.
2010-09-18 03:42:37 -04:00
c203fae26b
* Covered the type converters in SLUtil with unit tests.
...
* Does anyone have an example raw notecard to look at and test the notecard parser?
2010-09-18 02:49:42 -04:00
4d83879704
* More Mundane Tests
...
* SL Util tests of AssetType2ContentType and ContentType2AssetType
2010-09-17 23:27:41 -04:00
a22f007246
Improve the explanative text of migration failures
...
When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves.
2010-09-18 03:37:10 +01:00
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
cd42cdcc89
REST Console delivers responses with content type text/xml instead of text/plain.
...
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
2010-09-18 02:24:04 +01:00
2501372d3b
Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman
...
Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
2010-09-18 01:57:13 +01:00
889923841c
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
...
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
2010-09-18 01:43:22 +01:00
4327c795f8
Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
...
I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
2010-09-18 00:25:22 +01:00
b1ab3ea5d9
For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
...
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
33fbf0e329
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-09-17 18:41:29 -04:00
94f35890e7
* Fixed and re-enabled CacheTests
...
* Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework.
* Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
2010-09-17 18:41:12 -04:00
3a760ad12b
Overwrite the core version of the string parsing method with ours
2010-09-17 22:20:20 +01:00
bdd4dcf69b
Merge branch 'master' into careminster-presence-refactor
2010-09-17 22:12:48 +01:00
c08b6c2873
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 14:35:35 -07:00
e603521fd7
Applying the llParseString2List() patch from #5036 that Melanie claims was already applied
2010-09-17 14:32:49 -07:00
69749b81f9
* Add a few more tests to help our meager code coverage %.
...
* Tests Animation Constructors
* Tests Animation OSD Packing/Unpacking
* Tests the PrimeNumberHelper class which is used in the cache.
2010-09-17 03:11:57 -04:00
256c8cb62d
Send kill packets for avatars, too
2010-09-17 03:56:31 +01:00
87a1e00f05
Remove the now unused partslock
2010-09-17 04:00:00 +02:00
e32855d080
Merge branch 'master' into careminster-presence-refactor
2010-09-17 03:57:15 +01:00
7df4383235
Merge branch 'master' into careminster-presence-refactor
...
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:57:26 +01:00
b49cb3355f
Fixed a regression in SOG.Copy()
2010-09-16 17:57:00 -07:00
5321e0e69f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-16 17:31:24 -07:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
e3f1533705
Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}
2010-09-17 01:21:28 +01:00
5072429263
Send KillPackets on the Task queue rather than the State queue
...
Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along.
The kill packet would then be placed on the state queue and possibly get sent before the update
If the update gets sent afterwards then client get undeletable no owner objects until relog
Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue
Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist.
2010-09-17 01:16:21 +01:00
5b18f8be25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 01:01:12 +01:00
251f2444d0
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:50:48 +02:00
670357367e
Removing debug
2010-09-16 23:32:18 +01:00
1b2edfe75f
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
1e4e978f7f
Removing debug
2010-09-16 23:26:53 +02:00
a0c87b5af6
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:12:32 +02:00
d52b2b9ee7
minor: remove some mono compiler warnings
2010-09-16 20:46:24 +01:00
512ded6eb5
Catch a nullref
2010-09-16 21:07:09 +02:00
d50a072336
Suppress the strange "Result not Dictionary" messages that happen when
...
a region queries for a nonexistent presence.
2010-09-16 20:21:30 +02:00
ec89dc99b7
Some small bug fixes
2010-09-16 18:58:25 +02:00
58b1ee8e2c
Merge branch 'master' into careminster-presence-refactor
2010-09-16 18:04:50 +01:00
7383173d3d
extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() to reduce scope for kill/update race conditions
...
This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update
This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged
Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks
However, evidence suggests that there is still a kill/update race somewhere
2010-09-15 23:06:38 +01:00
e6bc77d832
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-15 23:03:02 +01:00
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
16f296f489
Instead of locking SOG.Children when a group is being removed from the scene, iterate over an unlocked list instead
...
Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView
At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on
Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either
2010-09-15 21:51:13 +01:00
571693d7b6
Revert last commit
2010-09-15 08:16:38 -07:00
77eb8ade8c
Don't throw an exception if the authorizationservice is missing a serviceuri config entry. Not every authorization service will need a URI.
2010-09-15 08:08:29 -07:00
1f74f013b2
Don't fart when deserializing a prim with no ParentGroup set yet
2010-09-15 07:59:28 -07:00
3275fbec54
Fix the above
2010-09-14 23:06:44 +01:00
7f7bbbb84a
Fix the above
2010-09-14 23:05:42 +01:00
18beb796bc
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:50:38 +01:00
585e575d23
Allow to place the connection strings and providers for estate and region
...
in their oqn sections, for those of us who don't want a catch-all
DatabaseService section.
2010-09-14 22:47:45 +01:00
8ed08a10d9
Remove long unused Region/Framework/ThreadTracker
...
All methods had already been deleted, only GetThreads() was left
2010-09-14 22:34:55 +01:00
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
540a1912ce
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-14 22:14:23 +02:00
356b1ef1d9
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:16:02 +01:00
e27f59cf42
reorder some code to avoid merge issues in the future
2010-09-14 22:15:16 +01:00
2f41bc4ca7
Fix merge issues
2010-09-14 22:14:08 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
cc290abf7a
Adjust the code for ghost prim removal to new information from Kitto
2010-09-14 22:13:44 +02:00
d299f8b55c
Fix a small left over buglet and also add checking of the physics actor
...
position on backup. This way, ant object that has been moved will be
checked for ghost prims as soon as it is persisted.
2010-09-14 19:41:53 +02:00
095d400f5b
fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSimDefaults.ini is present
...
this should allow the testsuite to run again and the autobuild to complete
2010-09-14 17:01:53 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
ec305a4825
LSL compatibility: Don't throw an exception if an invalid key is passed to llInstantMessage, instead shout about it and apply the usual delay. This now matches SL.
2010-09-13 17:43:45 -07:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
36f81c66e5
Comment out SOG storing debug log message
...
This can get very spammy with regularly changing objects. Please uncomment if required.
2010-09-14 00:05:38 +01:00
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
4aadfc3007
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:27:56 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
656e64b3ed
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:22:25 +01:00
8e51ca3a7b
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:17:42 +01:00
5e1aab92f5
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:12:48 +01:00
dd803b4f0c
minor: Add comments which explain what's going on wrt avatar movements at various points in the main scene loop and associated methods
2010-09-13 21:53:25 +01:00
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
47ac9f97b1
Re-enabled asset last access time logging in MySQL
2010-09-11 18:29:38 -07:00
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
d264f0d301
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-11 20:22:53 +01:00
5e5260ad1b
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:22:10 +01:00
220f82a0f0
Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/)
...
Also convert some tabs into spaces.
2010-09-11 00:27:52 +01:00
30306a775a
Made it impossible to create a user with names containing spaces and prevented passwords from being echoed after enter is pressed.
2010-09-10 23:19:18 +01:00
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back under 27 chars
...
Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
2010-09-10 21:56:04 +01:00
b597a295c4
Second pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:41:36 -07:00
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
9609faa8eb
* Run SimianGrid session updates asynchronously instead of from the main heartbeat thread
...
* Minor dead code cleanup
2010-09-09 15:05:22 -07:00
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
ae6682036d
Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only.
2010-09-08 14:13:01 -07:00
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
8cc3d60e59
Added constructor that takes an URL to asset and inventory simian connectors.
2010-09-08 14:09:43 -07:00
3fb4a17f10
No need for a config var for the HELO message on the server-side. It's robust.
2010-09-08 11:30:38 -07:00
904d6b787a
First version of the Hypergrid HELO service that will enable different backends to interoperate.
2010-09-08 09:53:57 -07:00
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
319007783c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-08 00:50:31 +02:00
7a1b1dd419
Make AddRestoredSceneObject reset the IsDeleted flag so we can take an
...
object out of the scene and then put it back in.
2010-09-08 00:49:32 +02:00
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
587bab79b4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 13:43:52 -07:00
029c954804
* Added sanity checks to the SimianAssetServiceConnector so it will throw a sensible error message when it is misconfigured instead of a mysterious "Uri is empty" error
2010-09-07 13:43:36 -07:00
b28d1b6ccd
Fix Simian regression
2010-09-07 20:21:05 +01:00
342c64b7ac
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-07 20:20:16 +01:00
50cc22c9e6
Fix Simian regression
2010-09-07 20:19:52 +01:00
5ca4c238e0
SimianUserAccountServiceConnector was not initializing the user cache
2010-09-07 11:33:46 -07:00
8ab4b277c1
Fix some issues with unlinking
2010-09-07 17:12:28 +02:00
2684ca0838
Merge branch 'master' into careminster-presence-refactor
2010-09-07 11:51:26 +01:00
8fda08d858
Make sure unlinked child prims get persisted
2010-09-07 11:48:28 +01:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
84ad9e4d4e
minor: comment out some excessive test logging
2010-09-07 02:05:44 +01:00
90cd035693
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 02:01:38 +01:00
3284356bba
Merge branch 'master' into careminster-presence-refactor
2010-09-07 01:48:00 +01:00
99bfb0d2a2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-07 01:45:08 +01:00
3d033520fa
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:43:20 +01:00
11f4a65f42
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:12:06 +01:00
e55f6d47e9
Add test that checks correct persistence when an unlink is quickly followed by deletion of a linked part
...
This test is temporarily not running since it currently fails due to a bug in this area
2010-09-06 23:28:52 +01:00
ab875b32c1
Make console backup command do a forced backup rather than non-forced
...
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
2010-09-06 23:12:03 +01:00
537fefa3f2
extend TestNewSceneObjectLinkPersistence() to check for presence of non-root linked prim
2010-09-06 23:06:23 +01:00
953b7f4917
Add test to check persistence of newly added pre-linked objects
...
Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate
NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead.
2010-09-06 23:00:24 +01:00
cfaefad754
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-06 21:45:17 +00:00
c719e016ed
Falling animation fix, comment out instrumentation.
2010-09-06 21:45:07 +00:00
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
8886afd319
Fix yet another cause of "Ghost attachments"
2010-09-06 21:59:52 +02:00
f4f9a2cb45
Don't turn off the sale settings on child prims when linking, and on copy
...
of prims anymore. The behavior now matches SL and can be used to link
vendor prims for transport
2010-09-06 18:14:24 +02:00
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
2010-09-06 17:24:10 +02:00
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
0246edc2ea
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
00a23eea0e
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 03:59:48 +02:00
b9c20fbaa7
Merge branch 'master' into careminster-presence-refactor
2010-09-05 19:15:49 +01:00
7f9f9f9246
Fix a handful of copypaste errors
2010-09-05 19:14:45 +01:00
1b770d3afc
Change UserAccountService to match
2010-09-05 19:09:30 +01:00
4243701d22
Make Simian profiles respect the module chosen in [Profile]
2010-09-05 19:06:50 +01:00
55d3c98917
Fix up presence connector in SimianGrid
2010-09-05 18:24:16 +01:00
0ca48b2486
Fix up Simian inentory
2010-09-05 18:14:31 +01:00
b2486df67c
Friends works differently, it' snot even a region module at all, but a connector
...
that is loaded by the core friends module. Change Simian to match.
2010-09-05 18:06:42 +01:00
1238b27d64
And the avatar services :)
2010-09-05 17:53:15 +01:00
a407ad38f6
Add the m_Enabled pattern to Simian Auth
2010-09-05 17:44:02 +01:00
d9e9c41e13
Add m_Enabled pattern to SimianGridConnector
2010-09-05 17:34:51 +01:00
4025b85a07
As an exmple, add the code to disable connectors intot he simian asset
...
connector
2010-09-05 17:24:05 +01:00
64ec14c8c4
Add missing IDwellModule interface
2010-09-05 17:08:57 +01:00
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
68f107b27e
Logout the presence if client IP verification fails.
2010-09-04 18:46:27 -07:00
953a487f5e
One more debug message to track an issue on Danger grid.
2010-09-04 18:09:17 -07:00
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
c0b16f09bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-04 01:38:11 +01:00
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
d4b572d2a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 23:29:59 +01:00
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
1e552e88e8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 14:50:42 -07:00
fc062a23af
Make SimianFriendsServiceConnector initialize like the other connectors and gracefully handle the case where it is loaded but disabled #monoaddinslol
2010-09-03 14:50:26 -07:00
b8da15c104
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
...
This is a patch from http://opensimulator.org/mantis/view.php?id=4973 . Thanks randomhuman
2010-09-03 22:38:40 +01:00
9b95bd259f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 22:27:01 +01:00
fe63fad394
minor: remove mono compiler warning
2010-09-03 22:26:15 +01:00
83f6550bcc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:37:30 -07:00
aadbffffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:36:59 -07:00
4f79143f3f
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
...
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
2010-09-03 13:36:35 -07:00
d6deebdd63
Add another variant of password hash construction to SimianAuthenticationServiceConnector.CheckPassword()
...
This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim
This is from patch http://opensimulator.org/mantis/view.php?id=4983 . Thanks cmickeyb.
2010-09-03 21:34:31 +01:00
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
71c0fc10df
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 21:14:23 +01:00
8daea4d7c0
llRot2Euler Tests
2010-09-03 21:11:13 +01:00
5cbc4e2a5f
Merge branch 'master' into careminster-presence-refactor
2010-09-03 19:18:03 +01:00
0a0f38b23c
Last+2 tweak
2010-09-03 10:31:16 -07:00
a5cce8d6d7
Last+1 tweak.
2010-09-03 10:13:41 -07:00
5bbf793f9e
One last tweak, hopefully.
2010-09-03 10:01:18 -07:00
77384eb28b
Another tweak. Sux^2
2010-09-03 09:26:33 -07:00
85e9160552
More tweaks related to my previous commit. Tweaks sux.
2010-09-03 09:02:08 -07:00
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
18213d26ec
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-03 03:27:47 +01:00
17a26c3701
Fix an issue with rezzing scripted objects.
2010-09-03 03:27:26 +01:00
457160afc3
Fix an issue with rezzing scripted objects.
2010-09-03 03:16:08 +02:00
21c5377af9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-09-02 16:36:43 -07:00
d96f5fa57d
Quick fix for making global references for gatekeepers that are not domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now.
2010-09-02 16:36:05 -07:00
24c73aa8b2
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-02 21:51:27 +00:00
16814dd8f1
Fixes to JUMP system.
2010-09-02 21:51:19 +00:00
1c8bc9b7b6
Remove commented code and the comment, as the change has proven out
2010-09-02 21:02:09 +01:00
7720419fc7
Experimentally comment the sending of unbaked avatars
2010-09-02 20:17:49 +01:00
ed72396d9b
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:59:12 +01:00
5ea979d515
Remove commented code and the comment, as the change has proven out
2010-09-02 20:51:27 +02:00
eea5d8368a
Experimentally comment the sending of unbaked avatars
2010-09-02 20:08:39 +02:00
713c666827
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:49:42 +02:00
7128e1a4ba
Implement UploadBakedTexture cap
2010-09-02 16:20:44 +01:00
0f40ec5c65
Implement UploadBakedTexture cap
2010-09-02 16:10:44 +02:00
db015963a9
Remove the annoying "Script saved" popups when saving scripts in task
...
inventory. They cause spam when using recompile scripts in selection
and are redundant because that message is also shown in the script window
message pane. These popups were a legacy from when we couldn't drive the
message pane and their finest hour has now come.
2010-09-02 14:17:33 +02:00
bbdf6cab50
Fix cast issue
2010-09-02 00:20:57 +01:00
203b7de266
Allow increasing the version in system folders
2010-09-02 00:04:17 +01:00
7efe7feef5
Update: Allow the version to increase only
2010-09-02 00:02:07 +01:00
93edc75147
Disallow modification of system folders. Prevent changing the type of folders
...
and prevent resetting the version number
2010-09-02 00:00:54 +01:00
b9db495d91
Fix sqlite migration problems by moving migrations in 019_RegionStore.sql and 020 into RegionStore.migrations
...
This shows that panda is still not running the sqlite database tests since this change fixes the test failure in that area when "nant test" is executed locally
2010-09-01 22:06:56 +01:00
09fba16094
Prevent Meta7 plants from being treated like dropped attachments and removed
...
from the sim.
2010-09-01 20:10:44 +02:00
2232e6f273
Improve sim health reporting. Output error message if heartbeat thread is restarted by scene. This may help to find out why this recovery mechanism isn't working.
2010-09-01 14:08:52 +02:00
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
c947a67b23
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-01 00:17:23 +01:00
c47de94263
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:36:46 +01:00
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
9c1c378aa1
Add ScenePresence.GetAttachments(uint attachmentPoint)
2010-08-31 22:16:23 +01:00
aca10cb027
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-31 22:26:17 +02:00
b973fe5297
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:24:11 +02:00
b8c58e5f9f
reinsert functionality to debug log more levels of incoming and outgoing client protocol packets
...
These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets)
This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
2010-08-31 18:27:10 +01:00
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
dd14c539af
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-30 21:24:08 +01:00
3cd7761d65
Report exception message as well as stack trace if a region fails to register with the grid service in grid mode
2010-08-30 21:23:19 +01:00
35d6181b78
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-30 11:42:17 -07:00
4cf5ef3cd4
Kick the user from the region in the circumstance that the TP home failed - ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
2010-08-30 11:41:20 -07:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
8ee31d97a8
Remove CRLF endings
2010-08-30 02:19:21 +01:00
eefb207c1b
Fix a casting operation to use ToString()
2010-08-30 02:10:11 +01:00
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
374807d194
Replace hardcoded 0 with KickFlags provided by the client.
...
This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
2010-08-28 02:45:28 +01:00
83fbf66444
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-28 02:41:00 +01:00
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
0f95cd209e
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
2010-08-27 17:25:04 -07:00
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
b4278510f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-27 22:53:02 +01:00
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
1f1d72eba5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-26 23:39:20 +01:00
5b4e0b72bc
Send a null result search packet when no results are passsed in
2010-08-26 23:38:35 +01:00
436fdc2ea8
More on mantis #4985
2010-08-26 14:48:29 -07:00
6198fe53e6
Addresses mantis #4985 -- exceptions in DataSnapshot
2010-08-26 14:19:52 -07:00
fb6d761e19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-26 22:13:46 +01:00
7f5501d3ab
minor: remove mono compiler warning
2010-08-26 22:13:31 +01:00
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
26fd673e20
Addresses mantis #4984 -- Datasnapshot exceptions.
2010-08-26 12:26:09 -07:00
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
d99c60164d
Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.
...
On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
2010-08-26 16:06:34 +01:00
a6869fbc3e
Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()
...
By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
2010-08-26 15:33:42 +01:00
87a6554d4b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
692cf3c657
Remove parts locking from data classes since these are using a copy of the scene object
2010-08-26 00:17:26 +01:00
166ab59420
replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway)
2010-08-26 00:15:26 +01:00
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
47818a2db3
Fix a horrible bug in SG, where iteration of scene objects is carried
...
out in a fashion that causes the delegate to be invoked once per child
prim for a given group.
2010-08-26 01:06:50 +02:00
4b47008d30
Correct whitespace
2010-08-26 00:37:54 +02:00
fc8d2be632
Merge branch 'master' into careminster-presence-refactor
...
This was rather conflicted. Please test linking.
2010-08-26 00:11:07 +01:00
252e159340
Merge branch 'master' into careminster-presence-refactor
2010-08-25 23:22:23 +01:00
75e2a2b3ce
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
604423d52b
Make scene object directories more robust and prevent deleted SOP's from
...
sticking around
2010-08-25 23:19:30 +01:00
739eb14741
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
22fd00b002
minor: remove mono compiler warning
2010-08-25 23:07:43 +01:00
24d06b12c2
If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
...
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
2010-08-25 23:05:54 +01:00
46c6c35d48
refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory
2010-08-25 22:46:49 +01:00
1096f43f0d
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
dc1baf8025
Change object cleanup again. Make scene object directories more robust and
...
prevent deleted SOP's from sticking around
2010-08-25 23:11:00 +02:00
1bcb2e788f
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
c13045b25e
Correct a logic error in attachment cleanup
2010-08-25 20:11:47 +02:00
314d1171ef
Lock the attachment cleanup so it doesn't go into an endless deletion frenzy
2010-08-25 16:06:06 +02:00
d69e992665
Split out actual scene object insertion code from Scene.Inventory.RezObject and move into SceneGraph.AddNewSceneObject()
...
The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages.
This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module
This code does not touch direct rez by a user
2010-08-24 23:25:19 +01:00
78f452050a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-24 22:29:32 +01:00
07d5a0779a
refactor: make RezObject() more readable
2010-08-24 20:53:25 +01:00
ef5b628191
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-24 19:22:00 +01:00
7296286267
Merge branch 'master' into careminster-presence-refactor
2010-08-24 19:20:43 +01:00
a7a45cb22c
Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.
...
This fixes Mantis #3923 .
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-24 19:19:26 +01:00
4e324ae3cb
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-08-24 19:07:42 +02:00
512a13dbe7
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-08-24 18:52:00 +02:00
5a05de0eec
Call attachment cleanup when an agent crosses out
2010-08-24 18:38:54 +02:00
483fc88b07
Merge branch 'master' into careminster-presence-refactor
2010-08-24 17:37:11 +01:00
b9e12ed3b7
Add a method to delete left over / dropped attachments
2010-08-24 18:20:24 +02:00
46d06b6c4c
add test to check move of task item to user inventory when a target folder is explicitly given
2010-08-24 17:10:52 +01:00
8bb073d99a
minor: stop test using obsolete property
2010-08-24 17:06:04 +01:00
35f719ae2f
refactor TestMoveTaskInventoryItemNoParent()
2010-08-24 17:04:54 +01:00
289c21099c
Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
...
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
de85aabcbe
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
c72d298202
Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.
2010-08-23 23:25:36 +01:00
1d01c91095
minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs
2010-08-23 23:21:44 +01:00
704a53fb9b
Fix bug in llGiveInventory() where items were disappearing on relog
...
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a
2010-08-23 23:16:48 +01:00
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
8a1640f0a1
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-22 09:32:49 -07:00
46412f4931
Fix llGetLinkKey and llGetNumberOfPrims to play nice with avatars in the linkset (emulated)
2010-08-22 09:32:40 -07:00
5c368c8d38
Refix the fix
2010-08-22 16:44:22 +02:00
0ca771c185
Provide a better implementation of llList2Float
2010-08-22 16:23:36 +02:00
98b2d3a7f2
Revert "Fix a typecasting issue in llList2Float. This addresses mantis #262"
...
This reverts commit 810840b862
2010-08-22 15:55:23 +02:00
32ddeab5e3
Add printing the default script engine name. Report real exceptions when
...
there is an issue with the config file, as a typo could cause configuration to
silently fail.
2010-08-22 14:26:58 +02:00
071edaff49
Suppress error messages about scripts not foind if they're in fact disabled
2010-08-22 13:51:15 +02:00
a0a25bb8ca
A stab at making a better bounding box calculation
2010-08-22 13:42:29 +02:00
f445659dd3
Finally putting estate_settings.xml to rest. There will be no more attempts
...
to read or write this file.
2010-08-21 17:38:47 +01:00
954329ec85
Don't allow oversized search reply packets
2010-08-21 17:30:41 +01:00
8613336674
Don't allow oversized search reply packets
2010-08-21 17:48:49 +02:00
3ffdadef70
Add support for attached avatars in llGetLinkKey()
2010-08-21 07:22:41 -07:00
839b08c32b
Removed the NotImplementedException from llSetSoundQueueing, because the function not working won't actually stop the script from working, firing an exception will.
2010-08-21 06:30:53 -07:00
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
ea1df09fa4
Forward-port a small improvement to the land out connector
2010-08-21 00:29:27 +01:00
f7c4be1fa1
Forward-port a small improvement to the land out connector
2010-08-21 00:46:16 +02:00
c448151f6b
Someone from germany broke the build :P mentioning no names
2010-08-20 11:38:59 -07:00
5155915de1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-20 19:36:04 +01:00
7aad5af498
Some code cleanup for console command "create region".
...
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
4463ebfbc2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:09:21 -07:00
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
86a61696d7
minor: remove mono compiler warning
2010-08-20 17:58:02 +01:00
4708083434
Use the database mthod directly to delete items in a single sql swoop
2010-08-20 18:53:33 +02:00
b1790ba56e
Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.
2010-08-20 11:25:31 -07:00
187ccd72f0
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-20 11:01:03 -07:00
cc8864b0e3
Get maturity level from access number. This addresses mantis #269
2010-08-20 11:00:14 -07:00
bb5dd9fbbc
Some code cleanup for console command alert.
...
Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts.
2010-08-20 17:53:21 +01:00
6f83b0ee46
Cleaned up a few more things related to incoming agents.
2010-08-20 09:02:05 -07:00
82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
47838e5fb3
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:46:46 +02:00
b4e7c62fbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-19 19:55:03 -07:00
a39ea07158
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
1955b79759
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
2010-08-19 18:55:30 -07:00
1ab631f015
Merge branch 'master' into careminster-presence-refactor
2010-08-19 20:25:17 +01:00
f639a9e5ae
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 20:24:46 +01:00
22fdd7b1f1
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:24:34 +01:00
a1074cad5c
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:41:55 +02:00
2b172bef72
Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."
...
Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.
This reverts commit e47608fc62
2010-08-19 09:14:20 -07:00
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
ee7c799699
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 11:46:07 +01:00
f58a809536
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
1a8a11140c
Revert "Adding Group managment to the offline system"
...
This reverts commit 7c673c79d4
2010-08-19 12:04:46 +02:00
fdc59ee802
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-19 12:02:26 +02:00
0344395776
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 12:01:40 +02:00
7c673c79d4
Adding Group managment to the offline system
...
Sending a group invite is offlined now
2010-08-19 08:31:51 +00:00
d547007e73
Improve some logging in LandConnector
...
This also eliminate the last 'OGS1' logging message (in this case, an erroneous one)
2010-08-19 01:57:07 +01:00
a72c7812f4
remove ancient and unused OpenSim.GridLaunch GUI code.
...
Current policy is that OpenSim core is not the place for gui tools
2010-08-19 01:11:10 +01:00
5e3d53bef2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-19 00:54:48 +01:00
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
e47608fc62
One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943 .
...
(Files .xml and .txt also want to be committed)
2010-08-18 16:22:50 -07:00
6ddf124c8a
Prevent a bad cast in llCreateLink().
2010-08-18 20:00:19 +01:00
fb2deb0d45
Prevent a bad cast in llCreateLink().
2010-08-18 20:17:20 +02:00
810840b862
Fix a typecasting issue in llList2Float. This addresses mantis #262
2010-08-18 04:23:56 -07:00
ca8b1e488c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-18 02:53:27 -07:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
a8c0b131f9
* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build
2010-08-17 13:50:04 -07:00
d7824b86d9
Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. Basically, let's not let the xml-rpc library do the DNS conversion...
2010-08-16 14:36:20 -07:00
69ad04cdf6
Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.
2010-08-16 12:03:13 -07:00
a8b80ef800
Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected.
2010-08-16 11:39:46 -07:00
77de28965a
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
2010-08-16 11:33:59 -07:00
f219e320bc
Increased the timeout on AgentUpdate to 30 sec and improved error message to try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
2010-08-16 08:51:56 -07:00
a5044e08fb
Better comment (related to previous commit)
2010-08-15 18:13:09 -07:00
5d29c0ec9d
Addresses mantis #4929 . Agent was being logged off the grid too soon -- things may still fail.
2010-08-15 18:10:54 -07:00
30d0bf4207
Fix SQLite database plugin for UserAccountData queries with a single word.
2010-08-15 17:27:06 -07:00
d5c24241b7
Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)
2010-08-15 17:25:27 -07:00
f2d7f3e731
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-14 14:00:12 +02:00
a32b0ce0ae
Fix a possible nullref in BestAvatarResponsiveness policy
2010-08-14 13:59:36 +02:00
042eb80a62
clearing some debugmessages
2010-08-14 08:59:57 +00:00
96e4099564
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-13 17:40:18 -07:00
d806741e9d
* Cleaned up the magic UUID definitions in AvatarWearable.cs
2010-08-13 17:39:45 -07:00
e1cff5f8c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-14 00:58:12 +01:00
46d0690b31
* Fixed a casing typo for Simian profile data
...
* Minor logging tweak in Simian asset connector
2010-08-13 16:56:01 -07:00
1463691cb6
In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from libomv rather than little endian then swapping
...
This avoids a problem with failing to swap on big-endian machines.
This addresses http://opensimulator.org/mantis/view.php?id=4849
Thanks to Valy- for pointing this out and submitting a suggestion patch
2010-08-14 00:48:12 +01:00
fcc83f2305
Unit test for ConfigurationLoader.
...
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
ae43a07f3b
Configuration files can read include files from relative paths.
2010-08-13 23:59:30 +01:00
8eeb3f2fd2
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
2010-08-13 23:29:01 +01:00
8acb401a14
minor: remove mono compiler warnings
2010-08-13 23:28:28 +01:00
c64bef146b
minor: remove mono compiler warnings
2010-08-13 23:18:05 +01:00
ab6dc47818
refactor: move binary statistics logging from scene into separate region module
2010-08-13 23:15:11 +01:00
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
9d84dfb687
minor: remove mono compiler warning
2010-08-13 21:44:44 +01:00
b30635a454
Establish new Objects/BuySellModule
...
Move Scene.ObjectSaleInfo() to this
2010-08-13 21:39:43 +01:00
feba3164af
minor: remove mono compiler warning
2010-08-13 21:19:32 +01:00
5d20f04e08
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
2010-08-13 21:18:26 +01:00
b51534852f
minor: remove mono compiler warning
2010-08-13 21:07:45 +01:00
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
39a748b47a
refactor: Use SOP.Flags rather than SOP.ObjectFlags
2010-08-13 20:23:53 +01:00
b43a731beb
Fix a nullref exception in the prioritizer
2010-08-12 05:40:41 -07:00
c98c6a2930
File wants to be committed
2010-08-11 20:38:10 -07:00
251be8a1be
Prettify console output for long avatar names.
2010-08-11 20:22:01 -07:00
576faee203
minor: change some logging levels
2010-08-11 23:17:29 +01:00
686f44c575
minor: change "no [GridInfo] config" warning to refer to "configuration files" rather than "OpenSim.ini"
2010-08-11 23:16:33 +01:00
7aac4d650f
Fix the llRemoveInventory recursive lock error (again)
2010-08-11 14:30:09 -07:00
24577876be
Add some console debug to help fix a threadlock issue.
2010-08-11 14:10:47 -07:00
ac581b532e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-11 13:40:31 -07:00
fa393cb13a
Fix Omega getting overwritten on startup.
2010-08-11 13:39:36 -07:00
d00a954d35
Log the state of the prejump flag
2010-08-11 03:09:56 +02:00
a5a60df687
Change chat packets to bypass the throttles. This should alleviate chat lag
2010-08-11 02:52:52 +02:00
af60b8ac16
Set triggering the texture and height update on a two second timer. This fixes
...
the texture rubberbanding.
2010-08-10 22:52:51 +02:00
4f62f00ca0
Changing prim color generates event CHANGED_COLOR.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:38:39 +01:00
3f942a4f74
Removed abstract SetText method from EntityBase to make cleaner API.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:37:15 +01:00
75f92faeb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-10 19:34:57 +01:00
158604a733
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-10 20:17:47 +01:00
2a1c11fda9
On shift-copy of an object, set up a new physics actor (as appropriate) for every copied prim, not just the root
...
This addresses http://opensimulator.org/mantis/view.php?id=4295
2010-08-10 20:15:44 +01:00
Melanie