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
Justin Clark-Casey (justincc)
2de3a1b9da refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim() 2012-01-25 23:22:07 +00:00
Melanie
2ca80add14 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 15:24:25 +00:00
Dan Lake
3d1f43046d Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreateDelegate, ObjectDeleteDelegate 2012-01-24 17:05:53 -08:00
Melanie
427ab55058 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 00:45:57 +00:00
Dan Lake
488fe0ae9c Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObjectDuplicate 2012-01-24 13:41:26 -08:00
Melanie
855d3a3ba5 Teleport routing, part 1 2012-01-24 04:06:37 +00:00
Melanie
f10288ceae Add handling bans properly 2012-01-24 03:14:00 +01:00
Melanie
0369d21917 Add teleport routing, first part 2012-01-24 03:13:44 +01:00
Dan Lake
e41f23dead Trigger event when prims are scheduled for an update. This gives modules early access to changed parameters. 2012-01-19 03:06:35 -08:00
Dan Lake
5ced49aaa8 Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access. 2012-01-19 03:03:22 -08:00
Dan Lake
2c6272d11a Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID 2012-01-19 03:01:37 -08:00
Melanie
b14a6acd2f Merge branch 'master' into careminster 2012-01-16 23:08:47 +00:00
Justin Clark-Casey (justincc)
59a0c50d48 Comment out noisy log lines I accidentally included in the nant build target adjustment commit. 
Left in the method doc.
 2012-01-16 23:04:08 +00:00
Justin Clark-Casey (justincc)
82ad9d4e04 Remove monocov and other obsolete nant build targets. 
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
 2012-01-16 22:58:58 +00:00
Melanie
4cbf8d728e Fix merge 2012-01-14 05:39:56 +01:00
Melanie
43128c9016 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-14 06:09:19 +00:00
Mic Bowman
e1a2c44ebe Cleaned up the LookAt code in SOP and SOG. Added support for incrementally 
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
 2012-01-13 14:48:56 -08:00
Diva Canto
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
Melanie
4492bc1bcd Merge branch 'master' into careminster 2012-01-12 17:52:29 +00:00
Melanie
5d9e135b5c Remove ViewObjectInventory method unsupported by core 2012-01-12 01:11:05 +01:00
Justin Clark-Casey (justincc)
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
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