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,204 Commits 5 Branches 96 Tags
a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82
Commit Graph

2650 Commits

Author SHA1 Message Date
Melanie
a4c2e7f599 Merge branch 'master' into careminster 2012-01-10 20:34:43 +00:00
Diva Canto
ce44f56af9 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-01-10 11:11:08 -08:00
Diva Canto
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
BlueWall
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
Melanie
1cc685e820 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-01-10 18:33:32 +00:00
BlueWall
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
BlueWall
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
BlueWall
95345521f0 TP Routing debug 
Fix test to checking against bitfield instead of int
 2012-01-09 17:04:34 -05:00
BlueWall
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
Melanie
bc08cc201b Merge branch 'master' into careminster 2012-01-09 19:22:06 +00:00
BlueWall
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
Melanie
520b8b342e Merge branch 'master' into careminster 2012-01-09 06:52:46 +00:00
BlueWall
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
Melanie
0e855fea7c Fix a build break 2012-01-09 01:05:19 +00:00
Melanie
1ebd79e413 Add the HG case to landing point checks 2012-01-09 00:54:59 +00:00
Melanie
d5c5bbe0a1 Update teleport routing to match Avination 2012-01-08 23:38:43 +00:00
Melanie
44cde8d5c6 Update teleport routing to match Avination 2012-01-08 23:36:49 +00:00
BlueWall
266167f5a3 Fix teleport routing 
Route non-owner avatars according to land settings
 2012-01-08 17:41:47 -05:00
Melanie
4bf2e19898 Merge branch 'master' into careminster 2012-01-07 18:11:21 +00:00
Justin Clark-Casey (justincc)
ba163ab05b Add method doc to SPA.Falling and use automatic private get property 2012-01-07 00:29:55 +00:00
Justin Clark-Casey (justincc)
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
Melanie
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
Melanie
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
Melanie
2c401b7359 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-01-05 08:12:34 +00:00
Melanie
97ba3c9346 Small fix to GetWorldPosition to get closer to Avination sit behavior 2012-01-05 08:11:52 +00:00
Melanie
e9296721c7 That needs to be callable from elsewhere! 2012-01-05 08:04:04 +01:00
Melanie
85d82c8140 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2012-01-05 07:43:16 +01:00
Melanie
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
Melanie
045f3b8b11 Clean up GetWorldPosition 2012-01-05 07:37:31 +01:00
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