Justin Clark-Casey (justincc)
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
Justin Clark-Casey (justincc)
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
Snoopy Pfeffer
1a18948935
Corrected console help texts for "save iar"
2012-02-03 23:04:18 +01:00
Melanie
0dbfa70443
Merge branch 'master' into careminster
2012-02-03 08:47:26 +00:00
Dan Lake
61adf36339
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
2012-02-02 18:19:22 -08:00
Dan Lake
ed846f11f1
OpenSim tests do not always create an EventManager so calls to trigger events during tests must check for null EventManager
2012-02-02 18:06:34 -08:00
Dan Lake
3257dbe76d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-02 17:44:11 -08:00
Dan Lake
146d78edfa
ObjectAddedToScene event should be fired when duplicating objects
2012-02-02 17:41:05 -08:00
Dan Lake
ee2b2aadc3
fix line endings
2012-02-02 17:39:05 -08:00
Melanie
bce5dfe711
Merge branch 'master' into careminster
2012-02-03 00:09:05 +00:00
Melanie
76a658324c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-03 00:07:23 +00:00
Melanie
573a64ad24
Merge branch 'master' into careminster
2012-02-03 00:05:59 +00:00
Melanie
574c240202
Fix test failure
2012-02-03 00:05:36 +00:00
Melanie
bdc31bddfc
Merge branch 'master' into careminster
2012-02-02 23:41:27 +00:00
Melanie
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
Justin Clark-Casey (justincc)
54d473e200
D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLinkNumber().
2012-02-02 23:35:16 +00:00
Justin Clark-Casey (justincc)
264c83aec4
Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api
...
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
2012-02-02 22:48:36 +00:00
Melanie
8f8b5f9a4d
Merge branch 'master' into careminster
2012-02-02 22:36:41 +00:00
Melanie
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
Justin Clark-Casey (justincc)
17df4185ce
Add stress tests for simple object add of 100 prim objects. Add time taken to output (this is unreliable).
2012-02-02 18:42:27 +00:00
Diva Canto
dbf6381e34
OpenID: server connector had a copy-and-paste error that made identity queries fail.
2012-02-02 08:39:23 -08:00
Melanie
fd7e82ee72
Streamline banning code using existing methods.
2012-02-02 16:51:39 +01:00
Melanie
857d4e60cc
Rehook the eject and freeze events that had gotten unhooked in the merge
2012-02-02 13:46:46 +01:00
Melanie
567f4c51f8
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:52:17 +00:00
Melanie
6fe4b6fbe8
Fix remembering attachment point and position when an item is rezzed in world.
...
Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script
in the root.
2012-02-02 02:51:59 +01:00
Melanie
dbc3f1ff92
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-02-02 01:53:13 +00:00
Dan Lake
0ce9ad4a56
Add event RegionHeartbeatEnd for modules interested in coordinating activity with region heartbeats
2012-02-01 17:01:28 -08:00
Dan Lake
c10193c72b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-01 16:25:35 -08:00
Melanie
45ad9e39a6
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:05:14 +01:00
Melanie
e5ae84b42b
Re-Add the reading of attachment data hat was lost in the merge
2012-02-02 01:04:54 +01:00
Melanie
16aa00e944
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-01 10:08:45 +00:00
Melanie
003bd9f1b3
Small optimization to last commit
2012-02-01 10:05:04 +00:00
Melanie
cc1476fc36
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-01 09:45:42 +00:00
Melanie
241ddd031f
Fix copy/paste errors
2012-02-01 09:45:15 +00:00
Melanie
c08d6df7e1
Prevent a changed attachment that has been saved from being saved again.
2012-02-01 09:38:20 +00:00
Melanie
fcc1fa2c32
Straighten out some attachment mess. Don't save attachment states for HG
...
visitors at all. On Leaving a sim, save only the changed ones. Don't save
all scripted stuff when leaving a sim.
2012-02-01 09:36:14 +00:00
Diva Canto
3d7b5e5e93
HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri.ToString() drops the port when it's port 80.
2012-01-31 22:00:59 -08:00
Justin Clark-Casey (justincc)
99e71222f0
Lay out script status in property per row format, since getting too long for console lines.
2012-02-01 00:27:42 +00:00
Justin Clark-Casey (justincc)
e3680f216e
Add count of events queued for a particular script in "scripts show" console command
2012-02-01 00:17:02 +00:00
Justin Clark-Casey (justincc)
8b3da1bff4
Make script console commands only show for selected region.
2012-02-01 00:10:07 +00:00
Justin Clark-Casey (justincc)
437de6743c
Implement "xengine status" console command to show various xengine stats
2012-02-01 00:07:06 +00:00
Justin Clark-Casey (justincc)
f028dca711
Add "show part uuid" and "show part name" console commands.
...
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.
2012-01-31 23:35:13 +00:00
Justin Clark-Casey (justincc)
996cc6097e
Implement "show object name <name>" console command to show details of an object with the given name
2012-01-31 23:21:02 +00:00
Justin Clark-Casey (justincc)
ac7cded080
Get rid of the "no objects found" feedback for now - this doesn't work well if a command is executed over multiple scenes.
2012-01-31 23:06:48 +00:00
Justin Clark-Casey (justincc)
ab89adfaef
Implement "show object uuid <uuid>" console command.
...
This will show details about a part with the given uuid if it's found.
2012-01-31 23:03:39 +00:00
Justin Clark-Casey (justincc)
647b326edc
Add more user feedback if an object isn't found for which delete was requested.
2012-01-31 22:27:05 +00:00
Justin Clark-Casey (justincc)
77b032549e
Add the name of a deleted object to the console output
2012-01-31 22:22:32 +00:00
Justin Clark-Casey (justincc)
e3e38e34c5
If a particular region is selected in the console, only try to delete 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.
2012-01-31 22:21:10 +00:00
Justin Clark-Casey (justincc)
9bd02b5da1
Move object delete commands into a commands region module, in preparation for adding similar show commands.
2012-01-31 21:57:45 +00:00
Melanie
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00