aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-017-43/+305
|\
| * 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 Uri...Diva Canto2012-01-311-1/+1
| | * Lay out script status in property per row format, since getting too long for ...Justin Clark-Casey (justincc)2012-02-011-6/+12
| | * Add count of events queued for a particular script in "scripts show" console ...Justin Clark-Casey (justincc)2012-02-011-4/+9
| | * 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
| | * Implement "show object name <name>" console command to show details of an obj...Justin Clark-Casey (justincc)2012-01-311-8/+49
| | * Get rid of the "no objects found" feedback for now - this doesn't work well i...Justin Clark-Casey (justincc)2012-01-311-11/+13
| | * Implement "show object uuid <uuid>" console command.Justin Clark-Casey (justincc)2012-01-312-5/+62
| | * 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 objects...Justin Clark-Casey (justincc)2012-01-311-16/+21
| * | 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
| |/
* | 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