aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'fb2f4f158c42ecfea114eb7cefd9074dc001626f' into bigmergeMelanie2011-12-080-0/+0
|\
| * Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block o...Justin Clark-Casey (justincc)2011-12-071-1711/+1370
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-0819-106/+229
|\ \ | |/
| * Remove unused SceneManager.TryGetAvatarsScene()Justin Clark-Casey (justincc)2011-12-071-20/+0
| * On an Exception in Scene.RemoveClient(), always remove the client (and SP) st...Justin Clark-Casey (justincc)2011-12-071-19/+28
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-076-0/+1
| |\
| | * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-12-076-62/+53
| | |\
| | * | Update libomv to 0.9.1BlueWall2011-12-074-0/+0
| | * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-0761-134/+821
| | |\ \
| | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-0522-243/+355
| | |\ \ \
| | * \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-023-5/+85
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-022-23/+28
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-023-29/+35
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-028-244/+430
| | |\ \ \ \ \ \ \
| | * | | | | | | | Make fix to Nini for null references in some cases.BlueWall2011-11-291-0/+0
| * | | | | | | | | Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-075-5/+157
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | properly lock CapsHandlers.m_capsHandlersJustin Clark-Casey (justincc)2011-12-071-26/+40
| * | | | | | | | Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-075-36/+13
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Stop accidentally setting up the UploadTexture caps handler with the same url...Justin Clark-Casey (justincc)2011-12-062-3/+1
* | | | | | | | Fix intersim object give messagesMelanie2011-12-071-0/+6
* | | | | | | | Fix up intersim give messagingMelanie2011-12-071-1/+41
* | | | | | | | Fix task inventory givingMelanie2011-12-074-56/+39
* | | | | | | | Remove harmless merge artefactMelanie2011-12-061-1/+1
* | | | | | | | Fix phantom and temp flags not takingMelanie2011-12-062-2/+10
* | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-066-27/+436
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Revert "Stop performing the asset save part of baked texture uploading on the...Justin Clark-Casey (justincc)2011-12-061-9/+5
| * | | | | | | Make "show appearance" a synonym for "appearance show"Justin Clark-Casey (justincc)2011-12-061-2/+8
| * | | | | | | In "appearance show", if a particular avatar is specified, print out texture ...Justin Clark-Casey (justincc)2011-12-061-5/+35
| * | | | | | | Actually send the avatar data if an individual avatar is specified, rather th...Justin Clark-Casey (justincc)2011-12-061-0/+2
| * | | | | | | Allow "appearance show" command to take an optional avatar nameJustin Clark-Casey (justincc)2011-12-061-8/+40
| * | | | | | | Make it possible to manually send appearance information via the "appearance ...Justin Clark-Casey (justincc)2011-12-061-11/+42
| * | | | | | | Provide feedback as to which avatars are resending appearance informion on "a...Justin Clark-Casey (justincc)2011-12-061-2/+11
| * | | | | | | Add test for not found response from GetTexture cap handler.Justin Clark-Casey (justincc)2011-12-054-0/+303
* | | | | | | | Adapt GodsModule to core changesMelanie2011-12-051-2/+2
* | | | | | | | Remove erroneous message about hyperlinks when entering an invalid region nameMelanie2011-12-051-2/+2
* | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-0556-104/+384
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-054-65/+67
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-0556-104/+384
* | | | | | | | Add the proper result code as per the LL announcement for llTransferLindenDol...Melanie2011-12-051-1/+1
* | | | | | | | Serialize the Volume Detect fieldMelanie2011-12-052-3/+9
* | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-051-14/+25
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-12-051-14/+25
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | For the GetTexture capability, if a data range is requested that covers the w...Justin Clark-Casey (justincc)2011-12-051-14/+25
| * | | | | | | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-054-65/+67
| |/ / / / / /
* | | | | | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int...Melanie2011-12-054-66/+67
|\ \ \ \ \ \ \
| * | | | | | | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-054-66/+67
* | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-0527-452/+825
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | HG: Added HEAD method to Helo service. This is the preferred method, but its ...Diva Canto2011-12-042-1/+35
| * | | | | | HG: Renamed one methodDiva Canto2011-12-045-5/+5