aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
| | | | to UUID.Zero because it ties up XMLRPC handlers needlessly.
* stop sending duplicated parcelProprieties at loginUbitUmarov2012-09-071-18/+39
|
* Merge branch 'ubitwork' into avinationMelanie2012-09-041-0/+6
|\
| * let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| | | | | | | | regions )
* | Remove debug spamMelanie2012-09-041-6/+6
| |
* | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-94/+110
|/ | | | it's own sub-method
* try to reduce potencial recursive lockingUbitUmarov2012-09-011-26/+51
|
* [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-2/+10
| | | | threads overlaps, some null objects exceptions, region crossing...
* Merge branch 'ubitwork' into avinationMelanie2012-08-241-0/+1
|\
| * fix vs2010 buildUbitUmarov2012-08-161-0/+1
| |
* | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
|/
* Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-151-0/+6
| | | | script needs this for proper logging.
* Merge branch 'careminster' into avinationMelanie2012-08-145-25/+51
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * Merge branch 'master' into careminsterMelanie2012-08-142-16/+37
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * As per lindn spec, disable detach and drop for temp attachmentsMelanie2012-08-141-0/+8
| | |
| | * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-142-17/+30
| | |
| * | Merge branch 'master' into careminsterMelanie2012-08-043-8/+13
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | | | | | | | | | | | | | | | | This was working in 0.7.2 but was accidentally removed from 0.7.3. The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info. Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
| | * Fix build break.Justin Clark-Casey (justincc)2012-08-031-1/+1
| | |
| | * Update settings loading in AvatarFactoryModule which should have been in ↵Justin Clark-Casey (justincc)2012-08-031-4/+4
| | | | | | | | | | | | last commit 205f2326
| | * Fix the recent windows compile error by putting newFont for case "R" in ↵Justin Clark-Casey (justincc)2012-08-031-3/+8
| | | | | | | | | | | | VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
| | * attempting to fix a build issueSignpostMarv2012-08-031-2/+2
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | fix build on winUbitUmarov2012-08-041-2/+2
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-033-262/+369
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Fixed a rare bug that caused Save OAR to fail because it thought it had ↵Oren Hurvitz2012-08-031-5/+11
| | | | | | | | | | | | timed-out The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running.
| * Delete old blank SOGSpamTestJustin Clark-Casey (justincc)2012-08-031-37/+0
| |
| * Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵Justin Clark-Casey (justincc)2012-08-031-253/+316
| | | | | | | | | | | | | | textures. The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement. This may be particularly important for GDI+ objects since they encapsulate native code entities.
| * Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-021-0/+75
| |
* | Merge branch 'master' into careminsterMelanie2012-08-011-3/+6
|\ \ | |/
| * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar ↵Justin Clark-Casey (justincc)2012-07-311-3/+6
| | | | | | | | | | | | would base its gain calculation on the previous avatar's gain, instead of the original input gain. This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
* | Merge branch 'avination' into careminsterMelanie2012-07-292-1/+4
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Bump number of URLs to 15000 per regionMelanie2012-07-291-1/+1
| | |
| * | Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
| | | | | | | | | | | | | | | | | | present on the command line for compatibility, but is ignored. Avination's IAR operations are administratively done and the staff doesn't have the passwords of the users.
* | | Merge branch 'master' into careminsterMelanie2012-07-288-12/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | When copying items, copy the item description field instead of the asset ↵Justin Clark-Casey (justincc)2012-07-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | description field. If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes. Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107 I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc.
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-252-0/+2
| | | | | | | | | | | | with other monitoring code from OpenSim.Framework
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-254-4/+4
| | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-6/+1
| | | | | | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
* | | Merge branch 'master' into careminsterMelanie2012-07-251-7/+44
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| | | | | | | | | | | | It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails.
| * | extend regression TestRezScriptedAttachmentFromInventory() to check actual ↵Justin Clark-Casey (justincc)2012-07-241-3/+19
| | | | | | | | | | | | start of script rather than just the script status reported by SOG.ContainsScripts()
| * | extend regression TestDetachScriptedAttachementToInventory() to check ↵Justin Clark-Casey (justincc)2012-07-241-3/+25
| | | | | | | | | | | | correct running status on a re-rezzed attachment
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+59
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'avination' into careminsterMelanie2012-07-231-29/+58
|\ \ \ | | |/ | |/|
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+58
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'master' into careminsterMelanie2012-07-232-1/+162
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-201-1/+1
| | | | | | | | | | | | attempting to fix a mono compile error.
| * | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵Robert Adams2012-07-202-1/+162
| | | | | | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance).
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | |/ /