aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* simplified vehicle fromXml. Use still comented on SceneObjectSerialized.csUbitUmarov2012-02-191-77/+117
|
* Vehicle XML serialization more complete. Inactived by coments in ↵UbitUmarov2012-02-193-4/+260
| | | | SceneObjectSerializar.cs until proper testing
* moved vehicle from SOG to SOPUbitUmarov2012-02-193-104/+79
|
* missing paramenters init plus some cleaningUbitUmarov2012-02-181-91/+16
|
* added a EnUsCulture whatever that is..UbitUmarov2012-02-181-4/+3
|
* a bit less human readable xmlUbitUmarov2012-02-181-25/+25
|
* added some ToXml2 to SOGVehicle ( unused untested )UbitUmarov2012-02-181-1/+84
|
* changed how vehicle data is stored and passed to physics. use unsafe in ↵UbitUmarov2012-02-182-163/+175
| | | | serializer, tried to control m_dupeInProgress
* vehicle parameters do cross (i hope) on regions in same instance ( others ↵UbitUmarov2012-02-182-13/+57
| | | | need xml)
* let SOG know about vehicles. Still needs serialization and applyphyscis on ↵UbitUmarov2012-02-183-30/+541
| | | | deserialize, etc
* don't freeze with a sitted avatar in a border without other sim. Still messy :(UbitUmarov2012-02-151-1/+8
|
* try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-152-6/+9
|
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-155-68/+194
|\
| * Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-02-152-52/+176
| |\ | | | | | | | | | careminster
| | * Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-142-54/+174
| | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
| | * Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-0/+4
| | | | | | | | | | | | crossings
| * | Merge branch 'master' into careminsterMelanie2012-02-153-15/+16
| |\ \ | | |/ | |/|
| | * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-132-8/+6
| | |\
| | | * Make ScenePresence.MovementFlag a private only settable value to reduce ↵Justin Clark-Casey (justincc)2012-02-111-7/+4
| | | | | | | | | | | | | | | | complexity of code analysis
| | * | On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-131-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than ERROR. Restore extra log message if shape processing fails. Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact.
| * | | Merge branch 'master' into careminsterMelanie2012-02-101-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | Fix bug where somebody taking a copy of an object they didn't own that was ↵Justin Clark-Casey (justincc)2012-02-101-1/+2
| | |/ | | | | | | | | | | | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825
* | | scenepresence change! in standup() give avatar a physical actor after ↵UbitUmarov2012-02-111-0/+10
| | | | | | | | | | | | deciding the new position. This reduces a bit the odds of it being still coliding with object.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-105-7/+65
|\ \ \ | |/ / | | | | | | | | | Conflicts: prebuild.xml
| * | Merge branch 'master' into careminsterMelanie2012-02-102-0/+11
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| | * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-102-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
| * | Merge branch 'master' into careminsterMelanie2012-02-094-7/+54
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| | * Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-084-10/+54
| | | | | | | | | | | | | | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878
* | | initial introdution of physics actor building control.UbitUmarov2012-02-083-9/+58
| | |
* | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵UbitUmarov2012-02-081-2/+4
|/ / | | | | | | not local offset. Currently physics interface only knows about world frame
* | Merge branch 'master' into careminsterMelanie2012-02-071-1/+2
|\ \ | |/
| * Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-071-1/+2
| | | | | | | | | | This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general). This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
* | Merge branch 'master' into careminsterMelanie2012-02-073-14/+32
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-071-1/+25
| |
| * Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | | | | | | | This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
| * Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-071-8/+4
| | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
* | Merge branch 'master' into careminsterMelanie2012-02-052-5/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Make configuration uniformBlueWall2012-02-051-3/+3
| | | | | | | | Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | | | | | variable in OpenSim.ini and Regions.ini match
* | Merge branch 'master' into careminsterMelanie2012-02-045-88/+57
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵Justin Clark-Casey (justincc)2012-02-043-22/+21
| | | | | | | | | | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-031-8/+7
| |\
| | * Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵Dan Lake2012-02-031-4/+7
| | | | | | | | | | | | triggering events on a potentially null Scene
| * | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-74/+29
| | | | | | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
* | | Merge branch 'master' into careminsterMelanie2012-02-034-41/+98
|\ \ \ | |/ /
| * | Commenting out new event until I can fix OpenSim tests. Currently, testing ↵Dan Lake2012-02-021-6/+6
| | | | | | | | | | | | objects does not create a Scene or EventManager so triggering events crashes some tests
| * | OpenSim tests do not always create an EventManager so calls to trigger ↵Dan Lake2012-02-021-2/+6
| |/ | | | | | | events during tests must check for null EventManager
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-022-14/+17
| |\
| | * Improve reliability of script state saving by covering various savingMelanie2012-02-022-14/+17
| | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
generated by cgit v1.1 at 2025-01-28 14:17:54 +0000