aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-314-107/+208
|\
| * Move object delete commands into a commands region module, in preparation for...Justin Clark-Casey (justincc)2012-01-312-104/+206
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-311-2/+1
| * Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCo...Justin Clark-Casey (justincc)2012-01-311-1/+1
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-01-311-11/+37
|\ \
| * | Draw brders around parcels for saleMelanie2012-01-311-11/+37
* | | Merge branch 'master' into careminsterMelanie2012-01-318-5/+227
|\ \ \ | |/ / |/| / | |/
| * Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl...Justin Clark-Casey (justincc)2012-01-311-1/+7
| * Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scen...Justin Clark-Casey (justincc)2012-01-316-1/+211
| * Fix:llSetText - limited text to a maximum of 254 charsPixelTomsen2012-01-311-3/+3
| * 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
| * | | 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
| * | Next step for world map overlaysMelanie2012-01-302-3/+11
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-300-0/+0
| |\ \ | | |/
| | * Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"BlueWall2012-01-301-1/+1
| * | 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
|\ \
| * | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-283-1/+28
| * | 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
|\ \ \ | | |/ | |/|
| * | Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-303-2/+18
* | | Merge branch 'master' into careminsterMelanie2012-01-295-6/+76
|\ \ \ | |/ / | | / | |/ |/|
| * Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/...Garmin Kawaguichi2012-01-291-1/+1
| * Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php...PixelTomsen2012-01-292-1/+72
| * 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 cf73afec356eed...Bo Iwu2012-01-281-2/+1
* | | 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
| |\ \ \ | | | |/ | | |/|
| | * | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t...Justin Clark-Casey (justincc)2012-01-281-4/+12
| | * | Add experimental --publish option to "save oar" so that OARs reloaded to the ...Justin Clark-Casey (justincc)2012-01-287-21/+116
| | * | Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in ...Justin Clark-Casey (justincc)2012-01-282-2/+2
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-286-10/+10
| | |\ \ | | | |/
| | * | Comment out xfer section in Scene.UpdateTaskInventory() which was causing spu...Justin Clark-Casey (justincc)2012-01-281-13/+20
* | | | Fix build breakMelanie2012-01-281-1/+2
|/ / /