aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "don't report the null uuid as a missing asset on saving oars/iars"Justin Clark-Casey (justincc)2010-06-291-5/+3
| | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. This change led to infinite timeout since the expected number of assets no longer matched requests. Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
* This is RC2. *** Changed the MySql driver back to the old one.*** Removed ↵Diva Canto2010-06-291-1/+1
| | | | | | Old Guids from connection strings. Merged master onto this branch.
* Merge branch 'master' into 0.7-post-fixesDiva Canto2010-06-2931-115/+284
|\ | | | | | | | | Conflicts: OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
| * This file wants to be committed.Diva Canto2010-06-291-70/+70
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-291-18/+71
| |\
| | * Thanks Micheil Merlin for Mantis #4784: [PATCH] llRotBetween does not return ↵dahlia2010-06-281-18/+71
| | | | | | | | | | | | | | | | | | correct rotations for a 180 degree angle between vectors Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
| * | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG ↵Diva Canto2010-06-293-4/+11
| | | | | | | | | | | | xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
| * | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ↵Diva Canto2010-06-293-12/+7
| |/ | | | | | | comments in InventoryAccessModule.
| * One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵Diva Canto2010-06-281-0/+7
| | | | | | | | being updated.
| * Fixes mantis #4815 and #4812Diva Canto2010-06-281-1/+5
| |
| * Change the way IRegionModule us referenced by IEmailModule toMelanie Thielker2010-06-282-2/+2
| | | | | | | | allow later conversion to new style
| * Remove AgentID and GroupOD from the signature of SOG.Copy(). They were neverMelanie Thielker2010-06-284-6/+6
| | | | | | | | used, but made for a very mispleading read of the code in the callers.
| * Fix Copy on Ray, Drag Copy and other little things. Removed the wrong andMelanie Thielker2010-06-283-20/+6
| | | | | | | | | | | | | | nonworking ownership assignment in SOG, which messed things up before. No longer trust the client to send the ID of the person something is copied as, since it allows to run a script with someone else's permissions. Properly adjust inventory ownership and perms.
| * Fix a simian compiler warningMelanie2010-06-271-1/+1
| |
| * Make drag copy and copy-on-ray handle friends list perms properlyMelanie Thielker2010-06-271-0/+22
| |
| * Add command-script to the Robust consoleRobert Adams2010-06-271-0/+41
| |
| * Addresses mantis #4789. Not really a fix, because the event is harmless ↵Diva Canto2010-06-271-1/+7
| | | | | | | | anyway. Just shouldn't happen normally.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-271-11/+12
| |\
| | * Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.Melanie2010-06-271-8/+9
| | | | | | | | | | | | Preserve "Anyone can move" flag in most cases.
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-272-1/+17
| | |\
| | * | Fix permission propagation to prevent permanently locked objects from beingMelanie2010-06-271-3/+3
| | | | | | | | | | | | | | | | created.
| * | | Fixed Robust.32BitLaunch.exeDiva Canto2010-06-271-2/+2
| | |/ | |/|
| * | Same patch as before but for SQLite.Diva Canto2010-06-271-0/+8
| | |
| * | Added checks to XInventory DB layer to truncate names and descriptions.Diva Canto2010-06-271-1/+9
| |/
| * don't report the null uuid as a missing asset on saving oars/iarsJustin Clark-Casey (justincc)2010-06-251-3/+5
| |
| * minor: fix spelling mistake interupt -> interrupt in migrationsJustin Clark-Casey (justincc)2010-06-251-6/+3
| | | | | | | | This is for mantis 4783
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-06-252-14/+14
| |
| * fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
| |
| * Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| | | | | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d.
| * Report http server onRequest() exception properly.Justin Clark-Casey (justincc)2010-06-251-1/+1
| |
| * stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵Justin Clark-Casey (justincc)2010-06-251-6/+7
| | | | | | | | | | | | isn't present in the presence dictionary the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
| * minor: Move log information about SYSTEMIP to the place where it's resolvedJustin Clark-Casey (justincc)2010-06-252-10/+14
| |
| * * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵John Hurliman2010-06-242-8/+23
| | | | | | | | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message
| * Move loading of parcels to before script start. Scripts using parcel functionsMelanie2010-06-241-3/+3
| | | | | | | | can fail if no land is loaded
| * Thank you, Snoopy, for a patch to reduce sim script startup CPU usageMelanie2010-06-231-10/+12
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-221-14/+14
| |\
| | * Line ending fixJohn Hurliman2010-06-221-14/+14
| | |
| * | Guard prioritizer agains null values as those produced by a bullet dyingMelanie Thielker2010-06-221-0/+3
| | | | | | | | | | | | before it can be updated
| * | Security fix: Allow only textures to be fetched using HTTP texture capMelanie Thielker2010-06-221-0/+12
| |/
| * * Fixed SimianGrid map tile uploads not having any objects in the imagesJohn Hurliman2010-06-222-4/+30
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-191-6/+16
| |\
| | * fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵dahlia2010-06-191-6/+16
| | | | | | | | | | | | Mantis #4510
| * | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"Melanie2010-06-191-7/+0
| |/ | | | | | | | | | | Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520.
| * This is a HACK! Downright nasty. For some reason, the devs of the mysqlMelanie2010-06-191-0/+7
| | | | | | | | | | connector have decided that their vision of timeouts is the only valid one. This uses reflection to show them the finger. Please test.
* | don't report the null uuid as a missing asset on saving oars/iarsJustin Clark-Casey (justincc)2010-06-251-3/+5
| |
* | minor: fix spelling mistake interupt -> interrupt in migrationsJustin Clark-Casey (justincc)2010-06-251-6/+3
| | | | | | | | This is for mantis 4783
* | fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
| |
* | stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵Justin Clark-Casey (justincc)2010-06-251-6/+7
| | | | | | | | | | | | isn't present in the presence dictionary the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
* | * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵John Hurliman2010-06-242-8/+23
| | | | | | | | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message
* | * Fixed SimianGrid map tile uploads not having any objects in the imagesJohn Hurliman2010-06-222-4/+30
| |