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
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
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
e5ae84b42b
Re-Add the reading of attachment data hat was lost in the merge
2012-02-02 01:04:54 +01:00
16aa00e944
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-01 10:08:45 +00:00
003bd9f1b3
Small optimization to last commit
2012-02-01 10:05:04 +00:00
cc1476fc36
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-01 09:45:42 +00:00
241ddd031f
Fix copy/paste errors
2012-02-01 09:45:15 +00:00
c08d6df7e1
Prevent a changed attachment that has been saved from being saved again.
2012-02-01 09:38:20 +00:00
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
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
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
e3680f216e
Add count of events queued for a particular script in "scripts show" console command
2012-02-01 00:17:02 +00:00
8b3da1bff4
Make script console commands only show for selected region.
2012-02-01 00:10:07 +00:00
437de6743c
Implement "xengine status" console command to show various xengine stats
2012-02-01 00:07:06 +00:00
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
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
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
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
647b326edc
Add more user feedback if an object isn't found for which delete was requested.
2012-01-31 22:27:05 +00:00
77b032549e
Add the name of a deleted object to the console output
2012-01-31 22:22:32 +00:00
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
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
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00
2f84d5397b
minor: remove mono compiler warning
2012-01-31 21:14:09 +00:00
1505c22995
Use Environment.TickCount & Int32.MaxValue; instead of 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
2012-01-31 21:09:26 +00:00
d76ca9cd93
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-31 20:54:04 +00:00
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
10b9348071
Remove scene object null check on SceneGraph.AddSceneObject(). Complain 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.
2012-01-31 20:30:30 +00:00
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
a98a146c50
Fix:llSetText - limited text to a maximum of 254 chars
...
mantis: http://opensimulator.org/mantis/view.php?id=5867
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-31 10:17:38 -07:00
c305b55012
Draw brders around parcels for sale
2012-01-31 06:31:02 +01:00
d2dfa4cfe7
Make parcel sale overlays work. No auction support.
2012-01-31 03:09:44 +00:00
71012ef883
Make parcel sale overlays work. No auction support.
2012-01-31 02:19:34 +01:00
fe0975dc24
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-30 21:39:36 +00:00
2b84b6d8b1
Use the requested sim's map, not our own
2012-01-30 21:39:12 +00:00
dbc039783b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-30 21:34:40 +00:00
a0206e5a17
Comment debug spam
2012-01-30 22:30:20 +01:00
0f181fe5d0
Fix displaying landmark and search info properly with long names
2012-01-30 22:30:02 +01:00
cfe924e4a8
Merge branch 'master' into careminster
2012-01-30 21:40:50 +00:00
e1cad4c34f
Use the requested sim's map, not our own
2012-01-30 21:38:46 +00:00
9dbb58ee8b
Merge branch 'master' into careminster
2012-01-30 21:26:47 +00:00
53c3faac5d
Patch in the rest of the maptile stuff
2012-01-30 21:24:21 +00:00
c4cc626dff
Add the needed column in the regions table and a few tweaks.
...
Warning: Contains a Migration
Warning: Cannot guarantee nut free
2012-01-30 20:34:32 +00:00
bde2ff5e78
Next step for world map overlays
2012-01-30 20:11:47 +00:00
ea16c9f858
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2012-01-30 19:49:12 +00:00
df9c35bc0f
Some plumbing for map overlays
2012-01-30 19:46:55 +00:00
9d93c4808e
lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if SceneObjectGroupsByFullID is updated elsewhere at the same time.
2012-01-30 19:21:58 +00:00
54e6b2402c
Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"
...
This reverts commit 00d1c88c59
2012-01-30 12:39:08 -05:00
00d1c88c59
Pickup map overlay tile from RegionSettings.ParcelImageID
2012-01-30 11:49:22 -05:00
Melanie