ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-20 06:35:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,956 Commits 5 Branches 87 Tags
71fc9f29f92edf2956ecb25dcbcdb97d262c8a14
Commit Graph

3987 Commits

Author SHA1 Message Date
UbitUmarov
c73c2fb070 add some default size setting and checks 2012-12-07 21:53:33 +00:00
UbitUmarov
93bede4e6a revert the use of avatar skeleton and use avatar size provided by viewers, 
since at least for now seems good enought
 2012-12-07 21:26:58 +00:00
UbitUmarov
2ea0dc55d7 create a new ode character also with the new information 2012-12-07 20:06:35 +00:00
UbitUmarov
d2499c4c31 *TEST* Use new avatar size in ubitODE. 2012-12-07 15:54:46 +00:00
UbitUmarov
de3180a63e avatar collision plane send to viewer is only relative to feet. change 
avatar collider, just rounding the boxes, etc
 2012-12-05 23:19:18 +00:00
UbitUmarov
8aa5fdb6a3 *TEST* diferent avatar collider 2012-12-03 19:45:45 +01:00
Melanie
ae8733bf59 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2012-11-23 03:39:49 +00:00
Justin Clark-Casey (justincc)
8c8c8a00a4 Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working. 
This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
 2012-11-23 02:22:30 +00:00
Justin Clark-Casey (justincc)
049987925d Add regression test for checking scene close when SceneManager is asked to close 2012-11-23 02:05:30 +00:00
Melanie
b09fb01571 Fix a build break introduced by us having a more efficient DoubleDictionary 
where core has a simple list
 2012-11-23 02:03:44 +00:00
Melanie
c2e89334b8 Merge branch 'master' into careminster 2012-11-23 01:44:35 +00:00
Justin Clark-Casey (justincc)
61808d148e Fix regression where we stopped closing scenes on simulator exit. 
If we don't do this, then these scenes don't get deregistered from the grid, amongst other things.
Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
 2012-11-23 01:01:39 +00:00
Melanie
45eedb635a Merge branch 'master' into careminster 2012-11-20 20:25:15 +00:00
Justin Clark-Casey (justincc)
597a101b9f Minor formatting for 0962a35d and a few one-line comments as to why that code is there 2012-11-20 05:09:44 +00:00
Iain Oliver
0962a35d2f Fix movetotarget on mega regions. 2012-11-20 04:54:13 +00:00
Melanie
7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
aeeaa3a0a9 Added AssemblyInfos to every dll in the OpenSim.Region namespace. 2012-11-14 11:09:43 -08:00
Melanie
2e0ce70e63 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/ModuleLoader.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2012-11-12 23:27:47 +00:00
Melanie
4edaa4e41a Completely remove the IRegionModule interface 2012-11-12 22:56:59 +00:00
Melanie
faca755995 Stop closing old style modules 2012-11-12 22:51:24 +00:00
Melanie
8c130bcaf5 Remove the old style module loader and all references to it 2012-11-12 22:50:28 +00:00
Melanie
d9b149b375 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-11-12 15:46:45 +00:00
SignpostMarv
f560d581bb document & 80-character width terminal formatting 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-11 13:50:38 -08:00
Melanie
d84de8c9b6 Merge branch 'master' into careminster 2012-11-11 21:16:58 +00:00
PixelTomsen
37c9700904 moving windlight-sources to correct namespace-named folder (world); add LightShare as Interface 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-11 11:17:40 -08:00
Melanie
389077345f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
 2012-11-11 16:31:01 +00:00
Diva Canto
e10d61ea8c One more module converted: CloudModule. 2012-11-10 11:59:08 -08:00
SignpostMarv
d0742cea3e 80 character-width terminal formatting of IDialogModule interface, removing superfluous whitespace & line-endings. 2012-11-10 08:12:30 -08:00
SignpostMarv
ee3d06220e Documenting parameters of methods on the IDialogModule interface 2012-11-10 08:12:30 -08:00
Justin Clark-Casey (justincc)
c94240ba5b Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() and make it compile again 
Not currently in test suite since not yet working.
Also add method doc to Scene.DeRezObjects()
 2012-11-10 05:43:57 +00:00
Diva Canto
19aab3e6fe Converted the WindModule to the new region module interface (38 to go). Also added both the WindModule and the SunModule to the Plugin manifest. 2012-11-09 16:28:30 -08:00
Diva Canto
7dfd1468cc Converted the SunModule to the new region module interface. (39 to go...) 2012-11-09 15:38:10 -08:00
Melanie
415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
SignpostMarv
5bff741544 marking IRegionModule interface as obsolete via System.ObsoleteAttribute, intentionally triggering a bunch of warnings in compiler output in hopes of encouraging other developers to refactor built-in modules when they have free time. 2012-11-09 14:20:24 -08:00
Melanie
5cbf7b3997 Merge branch 'ubitwork' into avination 2012-11-06 11:32:53 +01:00
teravus
4fa088bafb Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. 2012-11-04 22:57:24 -05:00
Melanie
f391d028de Add a method to query all registered script constants to allow non-XEngine 
script engines to use them.
 2012-11-04 22:39:15 +00:00
Melanie
dd416298f1 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-11-04 22:37:28 +00:00
Melanie
7e91a787fb Add a method to query all registered script constants to allow non-XEngine 
script engines to use them.
 2012-11-04 22:01:34 +01:00
Melanie
d0473b73da Merge branch 'master' into careminster 2012-11-03 15:38:47 +00:00
UbitUmarov
e642b80a79 actually remove the use of random on persist timmings 2012-11-02 17:49:54 +00:00
UbitUmarov
b8c19fe1a9 Create a new random when needed using normal time based seed instead of 
reusing a shared one than may not be valid
 2012-11-02 17:40:17 +00:00
Dan Lake
2e106cd5de Change to earlier commit for TargetVelocity to support distributed physics. 2012-11-02 03:09:04 -07:00
Melanie
cbe43c15ec Merge branch 'ubitwork' into avination 2012-11-01 22:25:29 +01:00
Melanie
e7a6328ea4 Merge branch 'master' into careminster 2012-11-01 15:52:32 +00:00
Dan Lake
ffe4d738fb Add TargetVelocity to PhysicsActor interface to support distributed physics. No change to existing functions. 2012-10-31 17:13:18 -07:00
Melanie
a2c6094324 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
 2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc)
6235d16c31 Make "show object part" command correctly display script status. 
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
 2012-10-31 00:31:18 +00:00
Melanie
28a4ea73ea Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/ChildAgentDataUpdate.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-10-31 00:13:33 +00:00