aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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-0319-37/+69
|\
| * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-0423-146/+312
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0313-17/+50
| | |\
| | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-0313-17/+50
| | | |\
| | | | * Fix: Covenant changed time not set ↵PixelTomsen2012-02-0313-17/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0310-123/+257
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵Dan Lake2012-02-031-4/+7
| | | |/ | | |/| | | | | | | | | triggering events on a potentially null Scene
| * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵Snoopy Pfeffer2012-02-035-12/+12
| | | | | | | | | | | | | | | | corresponding RemoteAdmin parameter
* | | | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-033-83/+58
| |_|/ |/| | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
* | | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ↵Justin Clark-Casey (justincc)2012-02-031-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | presence and population of m_avatars. This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated. Extending the lock is the easiest to understand solution rather than getting complicated with null checks. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
* | | Refactor common deserialization processor code to generic method ↵Justin Clark-Casey (justincc)2012-02-034-98/+63
| | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors()
* | | Change LandDataSerializer deserialization so that in the future it won't ↵Justin Clark-Casey (justincc)2012-02-036-75/+242
|/ / | | | | | | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility.
* | Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
| |
* | 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-0223-138/+271
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-033-15/+44
| |\
| | * D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not ↵Justin Clark-Casey (justincc)2012-02-021-1/+1
| | | | | | | | | | | | llGetLinkNumber().
| | * Add llGetLinkNumberOfSides to LSL_Stub and ILSL_ApiJustin Clark-Casey (justincc)2012-02-022-1/+7
| | | | | | | | | | | | | | | It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
| | * Add stress tests for simple object add of 100 prim objects. Add time taken ↵Justin Clark-Casey (justincc)2012-02-021-14/+37
| | | | | | | | | | | | to output (this is unreliable).
| * | Fix test failureMelanie2012-02-031-0/+1
| | |
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-0216-108/+197
| |/ | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
| * OpenID: server connector had a copy-and-paste error that made identity ↵Diva Canto2012-02-021-1/+1
| | | | | | | | queries fail.
| * Improve reliability of script state saving by covering various savingMelanie2012-02-023-14/+28
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-022-20/+22
| |
* | fix line endingsDan Lake2012-02-021-7/+7
| |
* | Add event RegionHeartbeatEnd for modules interested in coordinating activity ↵Dan Lake2012-02-012-10/+36
| | | | | | | | with region heartbeats
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-01136-1737/+5756
|\ \ | |/
| * Small optimization to last commitMelanie2012-02-011-5/+5
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-014-25/+279
| |\
| | * HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵Diva Canto2012-01-311-1/+1
| | | | | | | | | | | | Uri.ToString() drops the port when it's port 80.
| | * Lay out script status in property per row format, since getting too long for ↵Justin Clark-Casey (justincc)2012-02-011-6/+12
| | | | | | | | | | | | console lines.
| | * Add count of events queued for a particular script in "scripts show" console ↵Justin Clark-Casey (justincc)2012-02-011-4/+9
| | | | | | | | | | | | command
| | * Make script console commands only show for selected region.Justin Clark-Casey (justincc)2012-02-011-0/+9
| | |
| | * Implement "xengine status" console command to show various xengine statsJustin Clark-Casey (justincc)2012-02-011-4/+28
| | |
| | * Add "show part uuid" and "show part name" console commands.Justin Clark-Casey (justincc)2012-01-311-7/+97
| | | | | | | | | | | | | | | | | | These commands will display part/prim details for a given uuid or name The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset). This is for consistency with the "delete object" commands which only delete objects, not parts.
| | * Implement "show object name <name>" console command to show details of an ↵Justin Clark-Casey (justincc)2012-01-311-8/+49
| | | | | | | | | | | | object with the given name
| | * Get rid of the "no objects found" feedback for now - this doesn't work well ↵Justin Clark-Casey (justincc)2012-01-311-11/+13
| | | | | | | | | | | | if a command is executed over multiple scenes.
| | * Implement "show object uuid <uuid>" console command.Justin Clark-Casey (justincc)2012-01-312-5/+62
| | | | | | | | | | | | This will show details about a part with the given uuid if it's found.
| | * Add more user feedback if an object isn't found for which delete was requested.Justin Clark-Casey (justincc)2012-01-311-0/+15
| | |
| | * Add the name of a deleted object to the console outputJustin Clark-Casey (justincc)2012-01-311-1/+1
| | |
| | * If a particular region is selected in the console, only try to delete ↵Justin Clark-Casey (justincc)2012-01-311-16/+21
| | | | | | | | | | | | | | | | | | objects in that region, rather than in every region on the simulator The old wrong behaviour was in place before the command was extracted to a module.
| * | Fix copy/paste errorsMelanie2012-02-012-3/+3
| | |
| * | Prevent a changed attachment that has been saved from being saved again.Melanie2012-02-011-0/+1
| | |
| * | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-012-12/+19
| |/ | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
| * Move object delete commands into a commands region module, in preparation ↵Justin Clark-Casey (justincc)2012-01-312-104/+206
| | | | | | | | for adding similar show commands.
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-311-2/+1
| |
| * Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-1/+1
| | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
| * Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵Justin Clark-Casey (justincc)2012-01-311-1/+7
| | | | | | | | | | | | explicitly if there's an attempt to add any object with a zero UUID. Callers themselves need to check that they're not attempting to add a null scene object.