cadd645076
Renamed one var and deleted commented code. No functional changes.
2012-01-12 10:22:52 -08:00
b47c0d7e51
refactor: Move existing npc owner checks to NPCModule.CheckPermissions() methods and expose on interface for external calls.
2012-01-12 18:14:19 +00:00
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
6214e6a217
Allow update of stored entries within User Management Module-this is needed for proper work of HG friends.
...
See http://opensimulator.org/mantis/view.php?id=5847
2012-01-12 17:51:13 +00:00
5d9e135b5c
Remove ViewObjectInventory method unsupported by core
2012-01-12 01:11:05 +01:00
1a3a1e6665
Adapt a cast to using the new TeleportFlags
2012-01-11 19:00:17 +01:00
38db874755
If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception.
2012-01-11 14:33:26 +00:00
5f7e392c7c
Add a check to see if an asset exists before recreating it while
...
loading an archive. This does add an extra roundtrip to the asset
server if loading new assets but it protects against overwriting
(and potentially corrupting) existing assets.
2012-01-10 16:26:01 -08:00
53fb20880c
minor: Fix wrong column length in image queues report
2012-01-10 22:02:35 +00:00
5002f06d24
rename "show image queue" to "show image queues" in line with other udp info commands.
...
Eliminate redundant one line methods
2012-01-10 21:36:35 +00:00
ef074deb52
Add "show image queue <first-name> <last-name>" region console command
...
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
2012-01-10 21:30:12 +00:00
8fa1108b72
Merge branch 'master' into careminster
2012-01-10 21:28:59 +00:00
a4c2e7f599
Merge branch 'master' into careminster
2012-01-10 20:34:43 +00:00
ce44f56af9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 11:11:08 -08:00
7b84942f86
HG landing points: this hopefully fixes some confusion that was making HG avies always land in 0,0
2012-01-10 11:10:47 -08:00
18497cef73
Add avatar names to appearance log messages
2012-01-10 18:54:20 +00:00
a3bb1a81de
correct very minor typo in "debug scene" help
2012-01-10 18:47:30 +00:00
66783398d0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 13:43:42 -05:00
d67e9916b8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 18:42:37 +00:00
3deb52d399
Teleport Debugging
...
Move setting from ini to existing facitilies - thanks justincc
toggle with console command: debug teleport
2012-01-10 13:41:35 -05:00
d67e8291c8
Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a particular baked texture, if any.
...
This is for debugging to relate texture console entries back to particular users on the simulator end.
2012-01-10 18:41:07 +00:00
1cc685e820
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-01-10 18:33:32 +00:00
a22d0dcab9
HG Friends: fixed bug introduced by 571efeddb2 (r/17672)
2012-01-10 09:58:53 -08:00
707c8c6f2b
Add some run-time debugging support
...
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful.
Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
2012-01-09 18:19:55 -05:00
b3a12167d6
Use our TeleportFlags
...
Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
2012-01-09 17:54:35 -05:00
95345521f0
TP Routing debug
...
Fix test to checking against bitfield instead of int
2012-01-09 17:04:34 -05:00
3640afdd95
Fix teleport routing for incoming HG+Owner
...
Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
2012-01-09 14:31:22 -05:00
bc08cc201b
Merge branch 'master' into careminster
2012-01-09 19:22:06 +00:00
43145c7f67
Debugging HG teleport routing
...
Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
2012-01-09 13:07:02 -05:00
520b8b342e
Merge branch 'master' into careminster
2012-01-09 06:52:46 +00:00
34c42cdab0
Fix HG teleport routing
...
Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.
2012-01-09 01:37:28 -05:00
0e855fea7c
Fix a build break
2012-01-09 01:05:19 +00:00
1ebd79e413
Add the HG case to landing point checks
2012-01-09 00:54:59 +00:00
d5c5bbe0a1
Update teleport routing to match Avination
2012-01-08 23:38:43 +00:00
44cde8d5c6
Update teleport routing to match Avination
2012-01-08 23:36:49 +00:00
fb16d49511
Merge branch 'master' of /home/opensim/src/opensim
2012-01-08 17:56:03 -05:00
266167f5a3
Fix teleport routing
...
Route non-owner avatars according to land settings
2012-01-08 17:41:47 -05:00
4bf2e19898
Merge branch 'master' into careminster
2012-01-07 18:11:21 +00:00
32eb7ddc37
Fix threat level setting on osNpcPlayAnimation
2012-01-07 18:09:53 +00:00
6f19e231b6
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 18:09:45 +00:00
94fa6cb071
Fix threat level setting on osNpcPlayAnimation
2012-01-07 12:29:59 +01:00
efe51fd5cb
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 12:06:21 +01:00
69c0f252a4
Force the group tag of NPCs to "- NPC -" unless the name is completely blank.
2012-01-07 12:05:42 +01:00
58cb7cd084
fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level check
2012-01-06 23:07:48 -07:00
38ae479249
Make sure to prefix NPC names with "NPC:" so they can't be mistaken for users
2012-01-07 02:49:52 +01:00
f4231f0628
minor: remove mono compiler warning
2012-01-07 00:32:32 +00:00
ba163ab05b
Add method doc to SPA.Falling and use automatic private get property
2012-01-07 00:29:55 +00:00
c5c079f6aa
Fix bug where tapping home to stop falling would stop any avatar movement other than falling again.
...
Addresses http://opensimulator.org/mantis/view.php?id=5839
2012-01-07 00:17:40 +00:00
679d155a39
Fix some syntax issues
2012-01-06 23:08:18 +00:00
9668992493
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:50 +00:00
1cffd8fa03
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-06 22:36:35 +00:00
7518b075b7
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 22:35:06 +00:00
3073370d0e
Allow RemoteAdmin to deal with all the different kinds of region id parameter that have been used in different methods.
...
See http://opensimulator.org/mantis/view.php?id=5814
Thanks Michelle Argus!
2012-01-06 22:29:27 +00:00
70157a4ec5
Fix some syntax issues
2012-01-06 22:33:51 +01:00
a47aa46962
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:08 +00:00
a34278cfc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2012-01-06 22:41:26 +00:00
ff5a83d192
Fixed llAngleBetween() to allow denormal rotations
2012-01-06 21:14:42 +00:00
8c445dac67
Add script instruction count back to llRot2Euler. Other minor formatting/doc changes.
2012-01-06 21:12:22 +00:00
eb9bf71726
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:08:54 +00:00
7661a0b2a9
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
...
Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini
Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects
Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2
However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory
For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
2012-01-06 21:07:34 +00:00
de9d6096a5
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-06 21:37:01 +01:00
11c48ac807
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
2012-01-06 21:41:36 +00:00
e9b9eb6a4c
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:30:51 +00:00
f1846045a6
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 21:34:43 +01:00
f8c15d38a6
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 17:43:35 +00:00
3003133a66
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-06 17:39:39 +00:00
81cf774fe8
Merge branch 'master' into careminster
2012-01-06 17:38:53 +00:00
fbb2a7e90d
Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling
...
any methods, even those without threat, automatically. It is for use with
setups wanting to allow only specific methods to specific users.
2012-01-06 17:37:22 +00:00
31dc5aa728
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 13:15:04 +01:00
db482cb7dd
Fix up asset stuff
2012-01-06 00:04:32 +01:00
b06d878790
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:55:24 -05:00
23ce1dfc27
Remove a dangling command registration
2012-01-05 23:54:51 +01:00
fdfc4ab2a8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
2012-01-06 00:08:18 +00:00
f252161941
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:54:51 -05:00
b86e7715a8
Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure
2012-01-05 22:54:33 +00:00
e393b47da8
Merge branch 'new_modules'
2012-01-05 17:54:05 -05:00
2b4edd659f
Adding empty ISearchModule interface
2012-01-05 17:53:03 -05:00
5ea9740f1b
Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset
...
For debugging purposes.
2012-01-05 22:40:49 +00:00
da0fc3c8f5
Make "show asset" command available simulator side. Actually make the service command be "show asset" instead of "show digest" this time.
...
Last time I accidnetally just changed the usage message.
2012-01-05 21:11:32 +00:00
f06acc0a85
Add size and temporary information to "show asset" command
2012-01-05 21:05:10 +00:00
5b160f5b7b
Rename 'show digest' console command to 'show asset'
2012-01-05 20:56:29 +00:00
7319ba62dd
Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.
...
This stops them appearing twice when Hypergrid is enabled.
2012-01-05 20:51:49 +00:00
f2ff6d5186
Move asset commands from AssetService to AssetServerConnector so that we can harmonise the same commands on the simulator side.
...
No functional change.
2012-01-05 20:33:44 +00:00
50e459d265
recomment log messages I accidentally left uncommented
2012-01-05 19:44:06 +00:00
c201b54b85
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
2012-01-05 19:40:54 +00:00
da6c816204
Commenting out DataSnapShot message "Registering service discovery capability" for now.
...
Please uncomment if/when needed.
2012-01-05 17:10:38 +00:00
2c401b7359
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-05 08:12:34 +00:00
97ba3c9346
Small fix to GetWorldPosition to get closer to Avination sit behavior
2012-01-05 08:11:52 +00:00
e9296721c7
That needs to be callable from elsewhere!
2012-01-05 08:04:04 +01:00
85d82c8140
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-05 07:43:16 +01:00
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
045f3b8b11
Clean up GetWorldPosition
2012-01-05 07:37:31 +01:00
32b8fa4a77
Prevent spurious "CHANGED_POSITION" during region backup
2012-01-05 07:37:09 +01:00
8fb70a2058
Add "appearance rebake" command to ask a specific viewer to rebake textures from the server end.
...
This is not as useful as it sounds, since you can only request rebakes for texture IDs already received.
In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect.
Nonetheless, this is useful for diagnostic/debugging purposes.
2012-01-04 22:45:07 +00:00
0634c38505
Separate out rebake request code from cache validation code AvatarFactoryModule.
...
This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
2012-01-04 22:22:46 +00:00
7e6c84c334
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 21:41:28 +00:00
3a64522267
Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.
2012-01-04 21:40:15 +00:00
3a2ac0e2ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 12:01:32 -08:00
fc391d4b10
Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.
2012-01-04 12:01:18 -08:00
aa625da6a6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 19:53:48 +00:00
82df5de5cf
Remove the pointless LLClientView.m_imageManager null check.
...
Despite the code comments we never actually null it.
2012-01-04 16:15:05 +00:00
ecf9824b63
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 16:52:53 -08:00
0ab2289cdc
Access to these static methods to serialize objects are useful outside of serializer
2012-01-03 16:52:08 -08:00
983b49c0c8
commented out "Prevented flyoff" log message for now as this becomes problematic with bot testing.
...
Please uncomment if still needed.
2012-01-03 18:25:31 +00:00
01eacd3a31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 18:22:14 +00:00
e78a3913e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 12:22:13 -05:00
2c8e72217e
Merge branch 'new_modules'
2012-01-03 12:20:49 -05:00
6941058824
Profile Updates
...
Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
2012-01-03 11:10:23 -05:00
fa79588a20
minor: add missing newlines to pCampbot usage statement
2012-01-03 15:42:36 +00:00
a6e305063e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
2012-01-02 21:41:36 +00:00
fac8c25851
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
2012-01-02 21:31:42 +00:00
014a86c26b
Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.
2012-01-02 19:46:30 +00:00
87374274b9
Fix for failed http request status
...
Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
2012-01-01 23:44:46 -05:00
56dbcae402
Bug fix in map tiles in standalone: the map has been blank since commit 01ae916bad r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4 Author: Oren Hurvitz Date: 7/22/2011
...
This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
2011-12-30 21:32:28 -08:00
5d8ed077bc
Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
2011-12-30 19:17:35 -08:00
5aad1f7afe
Default LocalToGrid to true. Fixes minor bug introduced yesterday where old robust UserAccount service would result is LocalToGrid at the sim being false.
2011-12-30 10:40:57 -08:00
967ea51980
Set the local grid flag in the user account through the simian connector
...
This should make bi-directional hypergrid work.
2011-12-29 16:37:16 -08:00
571efeddb2
Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
2011-12-29 16:12:06 -08:00
42f5394677
Added field LocalToGrid in UserAccount. Context: make HG work in Simian.
2011-12-29 15:39:12 -08:00
98ab3dffa3
Deleted two obsolete files in Inventory modules.
2011-12-29 15:33:04 -08:00
ef4d989f37
Deleted unused methods from HGAssetBroker
2011-12-29 15:21:56 -08:00
6974596e83
Fixed mix-up in UserAccount fields when passing UserAccounts remotely.
2011-12-29 12:34:57 -08:00
b756077269
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-29 12:18:22 -08:00
70e36ee2b4
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
2011-12-29 12:17:58 -08:00
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
5b52440e61
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-28 09:24:02 +00:00
bf4d727cd5
Fix permissions being lost and correct slam behavior, removing icompatible
...
code inherited from core and dead code.
2011-12-27 14:04:49 +01:00
ad1c6442cd
Remove a debug spam
2011-12-27 01:40:44 +01:00
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
41f6d6a5ff
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-24 16:18:01 +01:00
2e07d24199
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:46:04 +01:00
c4e16b26bb
Merge branch 'master' into careminster
2011-12-24 02:21:35 +00:00
c9dbcfbb31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:43:44 +01:00
f2855d3668
Add setter for Acceleration on physics objects.
2011-12-24 01:41:32 +01:00
5b28e29530
Fix camera orientation for sit targets to use the prim actually sat on.
...
Now SL compatible.
2011-12-24 01:40:58 +01:00
04806e02ed
Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.
...
For SL compatibility only
2011-12-24 01:40:09 +01:00
f9a1fd5748
HG: one more adjustment with trailing /s
2011-12-23 15:08:13 -08:00
d38b8caf2b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-23 10:58:55 -08:00
26bb95fe3d
HG: AAdded a few missing /'s at the end of URLs
2011-12-23 10:58:30 -08:00
c6ce464dbc
remove the old region crossing handler
2011-12-23 10:13:32 -08:00
b8a914b15b
Merge branch 'master' into careminster
2011-12-23 01:00:34 +00:00
456c89a7a3
Fixes some problems with objects that attempt to cross a region boundary
...
into a region that does not exist. This is particularly problematic for
physical objects where the velocity continues to move them out of the
region causing an infinite number of failed region crossings. The patch
forces an object that fails a crossing to be non-physical and moves it
back into the starting region.
2011-12-22 16:59:51 -08:00
f394cb2e8f
fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag
2011-12-22 16:21:32 -08:00
6b08c051a3
Enables processing of hypergrid links through simiangrid services. Thanks
...
otakup0pe
2011-12-22 15:31:51 -08:00
790ca65c84
Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini
2011-12-22 20:22:15 +00:00
7ccd8f8f1d
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
2011-12-22 19:57:50 +00:00
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
f7dbdba447
Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()
2011-12-22 19:52:09 +00:00
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
a15a58a7c1
Merge branch 'master' into careminster
2011-12-22 17:33:31 +00:00
469955889e
Region crossings redone: (1) removed WaitForCallback. Now that we are passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
2011-12-22 09:30:06 -08:00
b72dd852b7
Merge branch 'master' into careminster
2011-12-22 16:58:38 +00:00
7f527814d5
And a typo fix
2011-12-22 16:57:49 +00:00
66a0471efa
Merge branch 'master' into careminster
2011-12-22 16:52:14 +00:00
6412349dec
Add a few comments, correct a merge artefact
2011-12-22 16:51:51 +00:00
2347593dac
Harmonizing SP with Avination
2011-12-22 16:48:52 +00:00
b970d4f976
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-22 16:37:25 +00:00
219ec7ef20
Fixing a bug introduced yesterday. This put the precondition test inside CheckForBorderCrossing the right way.
2011-12-22 08:18:03 -08:00
bb0c6a498b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-21 15:17:44 -08:00
ddff2f246c
Moved an external test into the method that uses those preconditions.
2011-12-21 15:17:26 -08:00
651f9f47d0
HG: Verify that the user is local
2011-12-21 14:56:38 -08:00
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
ca6113a4d5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-12-20 21:51:43 +00:00
fa0a71253f
Though the viewer warns about receiving this, not sending appears to break baked texture caching when crossing region boundaries.
...
Needs further investigation.
Revert "Stop sending the viewer its own AvatarAppearance packet."
This reverts commit 92039f295d
2011-12-20 18:54:15 +00:00
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
25cbba9bca
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
2011-12-20 09:43:39 -08:00
2b4ebe657c
Merge branch 'master' into careminster
2011-12-19 23:16:20 +00:00
87a2d8d51b
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
2011-12-19 23:03:45 +00:00
efa4284391
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
92039f295d
Stop sending the viewer its own AvatarAppearance packet.
...
The viewer warns in the log if it receives this.
Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
2011-12-19 20:13:48 +00:00
2899de1a5c
Stop unnecessarily sending the TextureEntry in client avatar updates.
...
As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead.
Tested this back to viewer 1.23.
Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free.
2011-12-19 19:19:05 +00:00
e8fbeeba5f
Fix race condition where the appearance update timer could be stopped just after another thread had started it on QueueAppearanceSave() or *Send()
...
However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
2011-12-19 19:08:24 +00:00
fc9400db07
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-19 19:07:35 +00:00
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
6baee2e10b
addresses mantis #5827
...
RAdmin - admin_save_oar fails if noassets parameter missing
thanks Michelle Argus
2011-12-19 11:51:03 -07:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
c4f1906b0a
Make raycast more efficient by checking exclusion flags earlier
2011-12-17 12:57:20 +01:00
8a9a8ed5c9
Fix hit testing link sets properly. Fix raycasting for LSL.
2011-12-17 12:31:25 +01:00
4d065f0453
Provide user feedback on execution of "backup" region console command
2011-12-17 02:42:43 +00:00
684482352c
Fix bug where objects couldn't be set back to the "none" group.
...
This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
2011-12-17 02:35:08 +00:00
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
964ec57ffe
Changed the async approach on close child agents. This may improve crossings a little bit.
2011-12-16 17:24:50 -08:00
99623894c7
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08:00
7f019cc196
If a startup simulator script is present, run it after the normal region selection code rather than before.
...
This allows the script to change the selected region without having it immediately undone.
Thanks to Garmin Kawaguichi for this patch.
2011-12-17 00:27:19 +00:00
1bf05fbb1f
refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
2011-12-17 00:11:17 +00:00
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
5c4056660f
Don't pass on ChaneWaterHeight event from EventManager is new water height is less than 0
...
This is to stop bad values and subsequent viewer crashes.
Thanks to Michelle Argus for this patch.
2011-12-16 21:16:01 +00:00
5d79f857b0
Comment out accidentally left in "Adding physics prim" log message
2011-12-16 20:54:28 +00:00
a9b39d6e5d
Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConnectorModule so that we can record cache misses
2011-12-16 20:53:50 +00:00
8300bb651e
Sends the consistent child agent position upon creation of the child agent in other regions, as opposed to <128, 128, 70>
2011-12-16 09:33:22 -08:00
3bf699ad36
No functional changes. Changed the prefix of that log message [CONNECTION BEGIN] to [SCENE] because that's where the message happens.
...
Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
2011-12-16 08:59:33 -08:00
7e4a2d69d5
HG minor bug fix and marked one method obsolete in UAS.
2011-12-16 08:48:29 -08:00
8013c0d2f5
Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter constructor
2011-12-15 22:33:14 +00:00
c0ba99e5ad
Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
...
Eliminate some copypasta for height setting in OdeCharacter
2011-12-15 22:29:36 +00:00
99570d8ebb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-15 21:59:01 +00:00
937c06db54
Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter
...
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
2011-12-15 21:57:22 +00:00
58ba81ae4e
minor fix to MegaRegions, typo spotted by Ubit!
2011-12-15 10:49:15 -07:00
6f2d80cc93
minor: add some currently commented log lines for use in debugging
2011-12-14 21:27:47 +00:00
69f29cb53e
Merge branch 'master' into careminster
2011-12-14 19:50:43 +00:00
e830a77860
Simplify some manipulation of _taintedActors in OdeScene
2011-12-14 18:33:44 +00:00
a110a7bd6a
Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour of just a _taintedPrims HashSet.
...
There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
2011-12-14 18:03:25 +00:00
cec88872ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-14 17:59:55 +00:00
84023c8162
Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe
...
Also fix usage message.
2011-12-14 16:43:49 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
f43e5f92fd
Just adding a comment to SendFullUpdatToClient
2011-12-13 23:34:59 -08:00
39736e52d8
Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition.
2011-12-13 21:37:17 -08:00
b242ceda1e
In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() in the same thread rather than on another one.
...
The caller is already an async thread from LLClientView so this doesn't hold up the client.
However, launching on a separate thread does remove the effect of m_setAppearanceLock
This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
2011-12-13 20:42:39 +00:00
df65245671
Spin off terrain save into a new thread and make it so that it uses the old
...
values for places where NaN are found.
2011-12-13 12:58:28 +01:00
6d1d1c0dbf
Comment debug spam
2011-12-13 00:36:44 +01:00
d18a9f22e7
Prevent a nasty deadlock on teleport
2011-12-12 23:43:45 +01:00
4dfd2c7d47
minor: remove pointless comment from OdeScene.cs
2011-12-12 19:31:50 +00:00
8418288e26
Make m_attachments private
2011-12-12 18:29:54 +01:00
afab4b276e
Remove spammy log messages when querying sim health
2011-12-12 13:51:31 +01:00
c34ab0ee66
Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding
2011-12-12 02:43:38 -08:00
95d533ce8a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-12 11:09:13 +01:00
52a4dbccbe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-12 11:42:22 +00:00
943b37b8e6
Send changed animation event asynchronously
2011-12-12 11:08:50 +01:00
3c55d2e776
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-12 00:41:53 -08:00
db8fd1eb9f
Added an option for extra settings within region ini file. Any non-hardcoded key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
2011-12-12 00:21:19 -08:00
8ae824ff09
Mantis 5816: osParseJSON Decoding Problems
...
osParseJSON uses hand-crafted decoding that has two issues
* does not seem to handle top-level JSON lists
* does not seem to handle unicode text
thanks otakup0pe!
2011-12-11 23:25:12 -07:00
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
323ffd7a89
Fix a regression that causes data from the attachments module to fail loading
2011-12-10 15:28:32 +01:00
db98698bbe
Prevent spurious error message when client tries to move a null item
2011-12-10 14:47:00 +01:00
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
e88ad5aab9
minor: remove a mono compiler warning
2011-12-09 23:55:54 +00:00
5f276c3212
Print out one log message for every missing baked texture, rather than two.
2011-12-09 23:54:39 +00:00
0daa5d8b4d
minor: comment out "unpacked appearance" log mesasge for now
2011-12-09 23:44:34 +00:00
f24898d049
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-09 23:24:52 +00:00
13b1c8c173
Do some clean up Scene.cs log messages.
...
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
2011-12-09 23:21:54 +00:00
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
5f6a4c4111
Merge branch 'master' into careminster
2011-12-09 22:55:08 +00:00
fc27806e90
remove some unused fields in ScenePresence
2011-12-09 22:52:54 +00:00
cb0da425d5
Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.
2011-12-09 22:41:39 +00:00
94c242f792
Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found.
...
In this situation we will now put out a slightly more meaningful log error message instead.
2011-12-09 22:36:51 +00:00
4e9f50b878
Add commented log lines to FetchInventoryDescendents2 path for future use.
...
Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
2011-12-09 22:32:28 +00:00
00b36eb0fe
Restore the Avination way of position and angle calculation so resizers
...
work again.
2011-12-09 20:55:48 +01:00
07c26111af
Fix llGetLinkKey to report avatars properly
2011-12-09 16:36:25 +01:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
63fe673af1
Revert "Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.""
...
This turned out not to be the upload texture issue.
This reverts commit 8721841fc3
2011-12-08 23:45:53 +00:00
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
55de189752
minor: remove some mono compiler warnings
2011-12-08 18:56:07 +00:00
54360dd20e
When a client connects to a scene, send other avatar appearance data asynchronously to reduce hold up in the IN UDP packet processing loop.
...
This is already being done for the initial object data send.
2011-12-08 18:39:56 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
3b991a2222
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-08 18:30:09 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
355cde464a
Simplify Scene.AddNewClient()
...
If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway.
So instead retain the check/create ScenePresence reference and use this.
2011-12-08 16:10:47 +00:00
8d7c353500
Merge branch 'master' into bigmerge
2011-12-08 05:47:45 +00:00
43732794dd
Remove a left over log output
2011-12-08 05:46:59 +00:00
1e4842eaba
Remove superfluous try block
2011-12-08 05:28:54 +01:00
7c7dd6269a
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 03:37:48 +01:00
ea1f5fb08d
Merge branch 'master' into bigmerge
2011-12-08 03:53:30 +00:00
603ad905e1
Adapt to justincc's remote admin refactor
2011-12-08 03:53:09 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
b459239833
Recover from an internal mess-up in the outgoing packet queues by creating
...
a new queue object.
2011-12-08 01:08:40 +01:00
dae58e0937
Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string
2011-12-07 22:42:05 +00:00
2b4de8f881
Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return success = true on success rather than false
2011-12-07 22:40:23 +00:00
fb2f4f158c
Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block of code to do password checks, etc., instead of copy/pasting this code into every method
2011-12-07 22:39:12 +00:00
eda770e978
Remove unused SceneManager.TryGetAvatarsScene()
...
It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code
This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
2011-12-07 21:17:13 +00:00
3d95015686
On an Exception in Scene.RemoveClient(), always remove the client (and SP) structure so that logout on unexpired packets isn't retriggered, causing the same exception
2011-12-07 18:43:48 +00:00
2b02d3dc84
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-07 17:33:06 +00:00
415b7b7ec4
Implement XMLRPCAdmin command admin_teleport_agent.
...
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
2011-12-07 17:31:57 +00:00
33c6067098
Trigger a Jenkins build
2011-12-07 11:21:50 -05:00
a8ed185c00
properly lock CapsHandlers.m_capsHandlers
2011-12-07 14:55:01 +00:00
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
ccba04f345
Fix intersim object give messages
2011-12-07 01:27:52 +01:00
f317953290
Fix up intersim give messaging
2011-12-07 01:02:46 +01:00
d6486fe14a
Fix task inventory giving
2011-12-07 00:43:59 +01:00
62d0a0cdbf
Remove harmless merge artefact
2011-12-06 22:58:00 +01:00
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
...
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
2011-12-06 21:42:56 +00:00
5490a3e549
Fix phantom and temp flags not taking
2011-12-06 19:44:45 +01:00
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
8721841fc3
Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."
...
This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..."
Needs more investigation.
This reverts commit 1854c52ea3
2011-12-06 18:37:13 +00:00
136a6a6e0f
Make "show appearance" a synonym for "appearance show"
2011-12-06 18:36:11 +00:00
b9a461c5ad
In "appearance show", if a particular avatar is specified, print out texture UUID for each bake type and whether the simulator can find it.
2011-12-06 18:32:27 +00:00
ec4f217af8
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 18:06:29 +00:00
1b9eb52850
Allow "appearance show" command to take an optional avatar name
2011-12-06 18:03:16 +00:00
4be85eeaa5
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 16:42:44 +00:00
d33d12ba83
Provide feedback as to which avatars are resending appearance informion on "appearance send" console command
2011-12-06 16:07:24 +00:00
319507f521
Add test for not found response from GetTexture cap handler.
...
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
2011-12-05 21:04:17 +00:00
af9ccfa15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-05 20:50:44 +00:00
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
09c043fe52
Adapt GodsModule to core changes
2011-12-05 21:26:43 +01:00
5b07370ec4
Remove erroneous message about hyperlinks when entering an invalid region name
...
in map search.
2011-12-05 21:26:06 +01:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
47d0a50a19
Add the proper result code as per the LL announcement for llTransferLindenDollars
2011-12-05 20:02:27 +01:00
e7cb63fcf7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-12-05 19:01:35 +00:00
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
37889eb3fa
For the GetTexture capability, if a data range is requested that covers the whole asset length, return HTTP PartialContent instead of NotFound
...
NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present.
We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour
https://issues.apache.org/bugzilla/show_bug.cgi?id=51878
Viewer 3.2.2 and very probably earlier appear happy with this.
Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown.
2011-12-05 18:35:03 +00:00
6362df1202
Serialize the Volume Detect field
2011-12-05 19:33:25 +01:00
1ece4feccd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-12-05 19:08:19 +00:00
cc482ee865
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-05 18:54:31 +00:00
2a8a46a32d
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 18:32:40 +01:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
3281b99362
Strip CR from http responses and limit them to 2048 chars
2011-12-05 15:57:47 +01:00
b7c9eb4bf7
Don't allow deletion of a terrain from the database unless we have one to replace it with
2011-12-05 15:46:57 +01:00
68bdd0b7fe
Fix setting seated avatar position and make llSameGroup work as in SL.
2011-12-05 15:26:49 +01:00
35800d6a86
Reinstate setter for OffsetPosition to allow setting the offset by script
...
while seated
2011-12-05 15:26:22 +01:00
19d6aa2bc9
Don't allow position update on sitting avatar. Don't bounds check sitting
...
avatars as they will be crossed by the vehicle and not individually
2011-12-04 20:16:07 +01:00
a2d98c7293
HG: Added HEAD method to Helo service. This is the preferred method, but its wide use will have to wait a few releases. So the sims are still calling GET for now.
2011-12-04 10:10:09 -08:00
080dfcc9c9
HG: Renamed one method
2011-12-04 08:24:16 -08:00
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
a82aea53f8
Split up test SceneHelpers to provide an AddChildScenePresence() call
2011-12-03 19:32:59 +00:00
a4d82895be
Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() since they don't do anything useful.
2011-12-03 19:14:37 +00:00
3852f05e6e
Extend TestCreateChildScenePresence to make assertions both at CreateAgent stage and then at Scene.AddClient()
2011-12-03 19:10:32 +00:00
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
ced820bd5e
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
aac3f2d04e
Add agent circuit number checks to TestCloseAgent()
2011-12-03 16:04:11 +00:00
aba42d8543
Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7
...
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
2011-12-03 15:54:06 +00:00
e75bcd4c59
Workaround for mesh to correct the number of faces in GetNumberOfSides(). Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor();
...
Signed-off-by: marc <mare@sounddog.net>
2011-12-03 15:49:19 +00:00
585fc5e79d
Update SP.PhysicsCollisionUpdate() doc.
...
It might be inefficient, but there are collisions every frame if the avatar is walking/standing on the ground or a prim surface
2011-12-03 02:51:17 +00:00
b66fe3e9ff
Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's called continuously even where there are no collisions
2011-12-03 02:45:02 +00:00
a009871827
Add basic TestFlyingAnimation() regression test
2011-12-03 02:39:21 +00:00
feef1dd732
Stop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpdate().
...
There's no point doing this if it's being called via PhysicsCollisionUpdate
2011-12-03 02:05:11 +00:00
f08aad8a40
For now, disable mechanism to limit avatar animation updates since this causes avatars to never reach the correct animation after some actions.
...
This reverts to situation where animation updates are made each frame on SP.PhysicsCollisionUpdate (though a packet is only sent if the anim actually changes).
m_updateCount was not being update on various avatar state changes, causing the correct animations to never be sent.
Always setting in HandleAgentUpdate() is not enough since the avatar is continually sending AgentUpdate packets.
One would need to identify all the conditions under which animations need to play out and set m_updateCount appropriately in SP.HandleAgentUpdate()
2011-12-03 01:47:12 +00:00
0ca8491bbe
refactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather than duplicating it with m_movementAnimation
2011-12-03 00:40:08 +00:00
5bbfb082dd
Use agent.Animator.CurrentMovementAnimation in llGetAgentInfo() rather than asking for a new determination
2011-12-03 00:33:24 +00:00
8185ce8b4a
Do a cagent.Anims != null check in SP.CopyFrom()
2011-12-03 00:30:13 +00:00
5ba8ca5662
Rename ScenePresenceAnimator.GetMovementAnimation() -> DetermineMovementAnimation() for better code readability
2011-12-03 00:27:21 +00:00
96c191f4fd
Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being processed if we're dealing with a child ScenePresence.
...
Neither of these can have any effect on child agents
Now leaving warning about trying to set animation on a child agent active. Might temporarily pop up now and again.
2011-12-03 00:09:18 +00:00
054ebe8878
Stop some places where we're trying to reset animations in child agents where such requests are ignored.
2011-12-02 23:56:01 +00:00
2a6597f61e
Remove pointless Animator.TrySetMovementAnimation("STAND") in ScenePresnece constructor.
...
Comment was right - it is indeed useless since SP always starts off as child and TrySetMovementAnimation screens out child SP
2011-12-02 22:14:47 +00:00
1854c52ea3
Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.
...
This prevents a possible race condition where the client would be told all baked textures had updated before they were in the asset service.
The client would then trigger a set appearance which, after a delay, would send the avatar appearance out to other clients.
The race condition seems unlikely because of this delay but it's still possible.
Might help with grey avatar appearances.
2011-12-01 23:38:25 +00:00
5460f2e035
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-01 23:24:15 +00:00
516c3dfbbb
Remove some debug code that had snuck in
2011-12-01 16:12:09 +01:00
797982ee11
Implement llTransferLindenDollars
2011-12-01 13:30:10 +01:00
8f2d7881bd
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-01 11:56:40 +01:00
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
2a9c9ae340
Provide more user feedback when "debug http" is set
2011-11-29 21:53:15 +00:00
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
679a5f6c0b
With "debug http 1", show the path with the query string instead of just the path.
...
Also simplifies debug levels to just 0 and 1
2011-11-29 17:26:45 +00:00
658d02b5e9
Improve some of the debug help messages
2011-11-29 16:56:31 +00:00
a17f93ff44
minor: remove mono compile warning, a Vector3 can never be null since it's a struct
2011-11-29 16:31:10 +00:00
d3a46b03bf
tabulate "show caps" output for easier readability
2011-11-29 16:29:11 +00:00
ff0d020007
Correct mistake in "debug eq" help
2011-11-29 16:18:14 +00:00
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-11-29 16:15:52 +00:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
80148bf784
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-28 11:21:15 +01:00
19c10c892a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-26 17:20:20 -05:00
ea0fc7b12c
Add missing property to llGetLinkPrimitiveParams
2011-11-26 17:06:28 -05:00
4efd9a3b7b
When removing an LSL sensor for a script (e.g. through llResetScript() or state change), don't also remove sensors for other scripts in the same prim.
...
Hopefully fixes http://opensimulator.org/mantis/view.php?id=4448 and http://opensimulator.org/mantis/view.php?id=4452
2011-11-26 01:55:36 +00:00
86cc00aaa8
minor: formatting changes in Scene.PacketHandlers.cs
2011-11-26 01:52:12 +00:00
46e1bcb6b6
minor: remove mono compiler warning
2011-11-26 01:40:46 +00:00
bafea2282a
Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().
...
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
2011-11-26 01:39:23 +00:00
11c19b0d2e
Use the same web fetch handler for every request from every avatar, since it contains no instance code
2011-11-26 00:29:01 +00:00
c5b636469d
Stop locking the requests coming in to WebFetchInvDecHandler.
...
There's no technical reason for this as the methods are thread safe. However, it might have served to slow down requests.
2011-11-26 00:13:04 +00:00
95a686dbf5
Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once
2011-11-25 23:45:29 +00:00
5b4fe23f7f
Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail.
...
Introduced just a few commits ago in 0688861
2011-11-25 23:43:57 +00:00
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
0688861aa7
Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem
2011-11-25 22:15:29 +00:00
8c82ff16ad
Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings
...
These cover a wider range of types.
2011-11-25 21:54:31 +00:00
0a0aa77cfd
Adding missing CrossBehaviour.cs file to fix build
2011-11-24 22:46:43 +00:00
8e32ce85a7
Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPosition()
...
At least on ODE, this wasn't doing any harm but there wasn't any point to it either
2011-11-24 22:45:29 +00:00
2ae5b40ca6
On pCampBot, add bot as a property on behaviours instead of passing it in every time
2011-11-24 22:36:45 +00:00
cbbd992df4
minor: remove mono compiler warning
2011-11-24 22:11:54 +00:00
a58f5b2f66
When setting packet level logging via "debug packet", apply to all clients, not just root ones.
...
Also adds scene name and client type (root|child) to logged information.
2011-11-24 22:08:34 +00:00
0a60e9537f
comment out a noisy log line I accidentally left in from the last commit
2011-11-24 21:30:40 +00:00
63c137820b
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
...
This allows us to comment out a bunch of code and simplify the codebase and readability.
2011-11-24 21:27:35 +00:00
0174e326e3
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-11-24 20:27:11 +00:00
decabe1181
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-24 20:22:17 +00:00
bdcfd6afee
Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots between neighbouring regions.
...
Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
2011-11-24 17:35:33 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
89b2fb2ff4
Append asset ID to URL for storage requests to allow caching proxies to work with Simian
2011-11-23 16:41:30 -08:00
5485e3da46
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-23 16:11:17 -08:00
0cb33a5398
Line endings
2011-11-23 16:09:11 -08:00
11dfd7711b
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-24 00:54:52 +01:00
ed7ddeecf2
Print out what behaviours are active when pCampBot starts up
2011-11-23 22:18:10 +00:00
d145750e87
Add teleport behaviour to pCampBot
...
This teleports the bot to any other regions +/- 5 on the x or y axis.
Quite aggressive at the moment since teleports keep occuring at a 1-10secs random interval.
No checking yet to see if teleport was successful.
2011-11-23 22:05:11 +00:00
1126efdcd0
In pCampbot, change "show status" command to "show bots"
2011-11-23 21:33:54 +00:00
9ae0641871
Rename Bot.BotManager to Manager
2011-11-23 21:33:10 +00:00
e9f2a9bddb
get pCampBot to extract nearby and store nearby region information
2011-11-23 21:19:10 +00:00
617f139aac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 21:10:50 +00:00
e394f83df0
Change random number generator property name in pCampbot
2011-11-23 18:00:41 +00:00
0738fc43e4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 10:50:29 -05:00
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
b56410285b
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-22 22:46:25 +00:00
ace4324e75
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
2011-11-22 22:37:06 +00:00
af90b52731
Comment out uncalled OdeScene.UnCombine()
2011-11-22 22:28:46 +00:00
fcb066cb5f
Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()
2011-11-22 22:23:52 +00:00
d639f7fdf3
minor: remove mono compiler warning
2011-11-22 22:16:09 +00:00
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-22 22:13:57 +00:00
daf99f8c0a
slightly simplify OdeScene.Simulate() by removing bool processtaints, since we can inspect count of taint lists instead.
...
also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
2011-11-22 21:51:00 +00:00
b89c48b1be
Improve the error messages returned if the HelloNeighbour call fails.
...
This is the message a region sends to its neighbours when it comes up
2011-11-21 22:06:43 +00:00
c4e4a29478
Slightly improve "Unable to space collide" logging message, though I don't think I've ever seen this.
2011-11-21 21:31:26 +00:00
4ddff7eb0f
Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character.
...
Ignoring the ancient code glyphs not to do this....
2011-11-21 21:29:56 +00:00
82dc7886fc
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-21 21:15:15 +00:00
7480f2fd0e
Restore defects list. In hindsight, the reason for this is becuase we can't remove the character whilst iterating over the list.
...
This commit also removes locking on OdeScene._characters since code is single threaded
2011-11-21 21:04:24 +00:00
546259b2ff
simplify operation of OdeScene._perloopContact
2011-11-21 20:30:37 +00:00
25d9001de1
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-21 20:17:36 +00:00
e33b0fa35b
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-21 20:12:04 +00:00
e67ba0ad06
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-21 20:01:34 +00:00
063f0f5d97
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-21 19:58:37 +00:00
225b925f4e
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-21 19:48:31 +00:00
Diva Canto