Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' into avination | Melanie | 2012-10-17 | 1 | -1/+1 |
|\ | |||||
| * | apply cmic fix to multi layer wearables | UbitUmarov | 2012-10-04 | 1 | -1/+1 |
| | | |||||
* | | Fix perms when linking an object. Set root part perms to the perms | Melanie | 2012-10-14 | 1 | -1/+1 |
| | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August. | ||||
* | | Remove spammy debug for IM | Melanie | 2012-10-11 | 1 | -3/+3 |
|/ | |||||
* | Attempt to fix Mantis #6311. Honor a destination folder if one is given | Melanie | 2012-10-02 | 1 | -0/+39 |
| | |||||
* | just remove the damm thing | UbitUmarov | 2012-09-26 | 1 | -1/+1 |
| | |||||
* | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 1 | -1/+0 |
| | | | | control flag to false | ||||
* | UriModule GetEvents also doesn't need a request body | UbitUmarov | 2012-09-26 | 1 | -0/+1 |
| | |||||
* | add missing transactionID in SendInventoryItemCreateUpdate. and make use | UbitUmarov | 2012-09-24 | 1 | -1/+1 |
| | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero | ||||
* | If an asset upload transaction doesn't exist for a CreateInventory request, | Melanie | 2012-09-24 | 3 | -36/+37 |
| | | | | simply process it as if UUID.Zero had been given. | ||||
* | Change the close tmeout from 2 to 3 seconds on teleport. This may | Melanie | 2012-09-16 | 1 | -1/+1 |
| | | | | prevent being logged out after a successful teleport. | ||||
* | Make the agent being kicked a child agent first so there won't be a ghost | Melanie | 2012-09-16 | 1 | -1/+2 |
| | |||||
* | Wait longer for arrival cofirmation to aid tps into laggy regions | Melanie | 2012-09-14 | 1 | -2/+2 |
| | |||||
* | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM | Melanie | 2012-09-09 | 1 | -0/+3 |
| | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly. | ||||
* | stop sending duplicated parcelProprieties at login | UbitUmarov | 2012-09-07 | 1 | -18/+39 |
| | |||||
* | Merge branch 'ubitwork' into avination | Melanie | 2012-09-04 | 1 | -0/+6 |
|\ | |||||
| * | let avatar keep flying in tps to same region. (still bad for other | UbitUmarov | 2012-09-04 | 1 | -0/+6 |
| | | | | | | | | regions ) | ||||
* | | Remove debug spam | Melanie | 2012-09-04 | 1 | -6/+6 |
| | | |||||
* | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 1 | -94/+110 |
|/ | | | | it's own sub-method | ||||
* | try to reduce potencial recursive locking | UbitUmarov | 2012-09-01 | 1 | -26/+51 |
| | |||||
* | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 1 | -2/+10 |
| | | | | threads overlaps, some null objects exceptions, region crossing... | ||||
* | Merge branch 'ubitwork' into avination | Melanie | 2012-08-24 | 1 | -0/+1 |
|\ | |||||
| * | fix vs2010 build | UbitUmarov | 2012-08-16 | 1 | -0/+1 |
| | | |||||
* | | Fix scripted detach of temp attachments | Melanie | 2012-08-20 | 1 | -6/+2 |
|/ | |||||
* | Add a real_id field to the login response if impersonation is used. The wrapper | Melanie | 2012-08-15 | 1 | -0/+6 |
| | | | | script needs this for proper logging. | ||||
* | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 5 | -25/+51 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | ||||
| * | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 2 | -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 attachments | Melanie | 2012-08-14 | 1 | -0/+8 |
| | | | |||||
| | * | Lay some groundwork for temp attachments. Decouple attachments from inventory. | Melanie | 2012-08-14 | 2 | -17/+30 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 3 | -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-03 | 1 | -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-03 | 1 | -1/+1 |
| | | | |||||
| | * | Update settings loading in AvatarFactoryModule which should have been in ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -4/+4 |
| | | | | | | | | | | | | last commit 205f2326 | ||||
| | * | Fix the recent windows compile error by putting newFont for case "R" in ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -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 issue | SignpostMarv | 2012-08-03 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | | fix build on win | UbitUmarov | 2012-08-04 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 3 | -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 Hurvitz | 2012-08-03 | 1 | -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 SOGSpamTest | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -37/+0 |
| | | |||||
| * | Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -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 VectorRenderModule | Justin Clark-Casey (justincc) | 2012-08-02 | 1 | -0/+75 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -3/+6 |
|\ \ | |/ | |||||
| * | Fix bug in SoundModule.TriggerSound() where every sound update to an avatar ↵ | Justin Clark-Casey (justincc) | 2012-07-31 | 1 | -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 careminster | Melanie | 2012-07-29 | 2 | -1/+4 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Bump number of URLs to 15000 per region | Melanie | 2012-07-29 | 1 | -1/+1 |
| | | | |||||
| * | | Allow load and save of IAR without a password. The password must still be | Melanie | 2012-07-24 | 1 | -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 careminster | Melanie | 2012-07-28 | 8 | -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-26 | 1 | -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-25 | 2 | -0/+2 |
| | | | | | | | | | | | | with other monitoring code from OpenSim.Framework | ||||
| * | | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. | Justin Clark-Casey (justincc) | 2012-07-25 | 4 | -4/+4 |
| | | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules. |