ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 17:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,642 Commits 5 Branches 96 Tags
433d5f1d3e60438fcad9019fc6e7c0fd11386a8e
Commit Graph

2771 Commits

Author SHA1 Message Date
Melanie
32b8fa4a77 Prevent spurious "CHANGED_POSITION" during region backup 2012-01-05 07:37:09 +01:00
Dan Lake
fc391d4b10 Added EventManager.OnRegionStarted which is triggered when Heartbeat is started. 2012-01-04 12:01:18 -08:00
Dan Lake
ecf9824b63 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-03 16:52:53 -08:00
Dan Lake
0ab2289cdc Access to these static methods to serialize objects are useful outside of serializer 2012-01-03 16:52:08 -08:00
Justin Clark-Casey (justincc)
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
Melanie
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
Diva Canto
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
Melanie
c9dbcfbb31 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2011-12-24 01:43:44 +01:00
Melanie
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
Melanie
b8a914b15b Merge branch 'master' into careminster 2011-12-23 01:00:34 +00:00
Mic Bowman
f394cb2e8f fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag 2011-12-22 16:21:32 -08:00
Justin Clark-Casey (justincc)
7ccd8f8f1d rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property 2011-12-22 19:57:50 +00:00
Melanie
eef6f92029 Merge branch 'master' into careminster 2011-12-22 19:52:59 +00:00
Justin Clark-Casey (justincc)
f7dbdba447 Remove unused m_physicalPrim parameter from SOG.ApplyPhysics() 2011-12-22 19:52:09 +00:00
Justin Clark-Casey (justincc)
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
Melanie
b72dd852b7 Merge branch 'master' into careminster 2011-12-22 16:58:38 +00:00
Melanie
7f527814d5 And a typo fix 2011-12-22 16:57:49 +00:00
Melanie
66a0471efa Merge branch 'master' into careminster 2011-12-22 16:52:14 +00:00
Melanie
6412349dec Add a few comments, correct a merge artefact 2011-12-22 16:51:51 +00:00
Melanie
2347593dac Harmonizing SP with Avination 2011-12-22 16:48:52 +00:00
Melanie
b970d4f976 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-22 16:37:25 +00:00
Diva Canto
219ec7ef20 Fixing a bug introduced yesterday. This put the precondition test inside CheckForBorderCrossing the right way. 2011-12-22 08:18:03 -08:00
Diva Canto
bb0c6a498b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-12-21 15:17:44 -08:00
Diva Canto
ddff2f246c Moved an external test into the method that uses those preconditions. 2011-12-21 15:17:26 -08:00
Melanie
ca6113a4d5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-12-20 21:51:43 +00:00
Justin Clark-Casey (justincc)
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
Diva Canto
dd69c9fd20 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-12-20 09:53:05 -08:00
Melanie
2b4ebe657c Merge branch 'master' into careminster 2011-12-19 23:16:20 +00:00
Justin Clark-Casey (justincc)
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
Melanie
efa4284391 Merge branch 'master' into careminster 2011-12-19 21:30:57 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
759f1d2dbe Merge branch 'master' into careminster 2011-12-18 10:49:45 +00:00
Melanie
8a9a8ed5c9 Fix hit testing link sets properly. Fix raycasting for LSL. 2011-12-17 12:31:25 +01:00
Justin Clark-Casey (justincc)
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
Diva Canto
964ec57ffe Changed the async approach on close child agents. This may improve crossings a little bit. 2011-12-16 17:24:50 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
a3a17e929e Stop generating client flags when we send out full object updates. 
These were entirely unused.
 2011-12-16 23:20:12 +00:00
Justin Clark-Casey (justincc)
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
Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
898549d13e Merge branch 'master' into careminster 2011-12-14 08:57:55 +00:00
Dan Lake
f43e5f92fd Just adding a comment to SendFullUpdatToClient 2011-12-13 23:34:59 -08:00
Dan Lake
39736e52d8 Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition. 2011-12-13 21:37:17 -08:00
Melanie
6d1d1c0dbf Comment debug spam 2011-12-13 00:36:44 +01:00
Melanie
d18a9f22e7 Prevent a nasty deadlock on teleport 2011-12-12 23:43:45 +01:00
Melanie
8418288e26 Make m_attachments private 2011-12-12 18:29:54 +01:00
Melanie
afab4b276e Remove spammy log messages when querying sim health 2011-12-12 13:51:31 +01:00
Dan Lake
c34ab0ee66 Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding 2011-12-12 02:43:38 -08:00