aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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.
* | | Merge branch 'master' into careminsterMelanie2012-01-314-107/+208
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-01-311-11/+37
|\ \ \ | | | | | | | | | | | | careminster
| * | | Draw brders around parcels for saleMelanie2012-01-311-11/+37
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-01-318-5/+227
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * | 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.
| * | Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵Justin Clark-Casey (justincc)2012-01-316-1/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Fix:llSetText - limited text to a maximum of 254 charsPixelTomsen2012-01-311-3/+3
| | | | | | | | | | | | | | | | | | mantis: http://opensimulator.org/mantis/view.php?id=5867 Signed-off-by: nebadon <michael@osgrid.org>
| * | Make parcel sale overlays work. No auction support.Melanie2012-01-312-7/+87
| | |
* | | Make parcel sale overlays work. No auction support.Melanie2012-01-312-7/+87
| | |
* | | Comment debug spamMelanie2012-01-301-3/+3
| | |
* | | Fix displaying landmark and search info properly with long namesMelanie2012-01-301-1/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-301-5/+7
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-301-5/+7
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-303-20/+46
| | |\ \
| | * | | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ↵Justin Clark-Casey (justincc)2012-01-301-5/+7
| | | | | | | | | | | | | | | | | | | | SceneObjectGroupsByFullID is updated elsewhere at the same time.
| * | | | Use the requested sim's map, not our ownMelanie2012-01-301-2/+2
| | |/ / | |/| |
* | | | Use the requested sim's map, not our ownMelanie2012-01-301-2/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-01-303-20/+46
|\ \ \ \ | |/ / /
| * | | Patch in the rest of the maptile stuffMelanie2012-01-301-3/+7
| | | |
| * | | Add the needed column in the regions table and a few tweaks.Melanie2012-01-301-0/+9
| | | | | | | | | | | | | | | | | | | | Warning: Contains a Migration Warning: Cannot guarantee nut free
| * | | Next step for world map overlaysMelanie2012-01-302-3/+11
| | | |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-300-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * | Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"BlueWall2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00d1c88c59c10aa8d34fa36910cf0f1f0e9878b8. Need to dig a little deeper to see exactly how V1 viewers are using this
| * | | Some plumbing for map overlaysMelanie2012-01-301-15/+20
| |/ /
| * | Pickup map overlay tile from RegionSettings.ParcelImageIDBlueWall2012-01-301-1/+1
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-01-305-10/+37
|\ \ \ | | | | | | | | | | | | careminster
| * | | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-283-1/+28
| | | | | | | | | | | | | | | | RemoteAdmin message
| * | | Fix calculating land prim count type width issueMelanie2012-01-281-8/+8
| | | |
| * | | Prevent an overlong description from messing up a ParcelInfoReplyMelanie2012-01-281-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-01-303-2/+18
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | | Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-303-2/+18
| | | | | | | | | | | | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | | | Merge branch 'master' into careminsterMelanie2012-01-295-6/+76
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Fix llEdgeOfWorld functionality - see mantis ↵Garmin Kawaguichi2012-01-291-1/+1
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5865 Signed-off-by: nebadon <michael@osgrid.org>
| * | Fix:Get embedded objects in notecard ↵PixelTomsen2012-01-292-1/+72
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org>
| * | Merge branch 'master' of /home/opensim/var/repo/opensim into mapworkBlueWall2012-01-2811-40/+150
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-2811-40/+150
| | |\ \
| * | | | Adding our parcel's generated id to map packetsBlueWall2012-01-281-2/+2
| |/ / /
| * | | Send CHANGED_TELEPORT during local TP again - partially revert ↵Bo Iwu2012-01-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | cf73afec356eed30e169be3ce71edad89b4fdb37 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | | Make all NPCs owned by defaultMelanie2012-01-281-1/+1
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-2811-29/+130
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-01-2811-29/+130
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
generated by cgit v1.1 at 2024-10-25 19:22:37 +0000