aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * Mantis 5816: osParseJSON Decoding Problemsnebadon2011-12-113-191/+72
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-102-14/+7
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-102-119/+143
* | Merge branch 'master' into careminsterMelanie2011-12-103-0/+14
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-103-0/+14
* | Merge branch 'master' into careminsterMelanie2011-12-107-90/+49
|\ \ | |/
| * minor: remove a mono compiler warningJustin Clark-Casey (justincc)2011-12-091-1/+1
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ...Justin Clark-Casey (justincc)2011-12-095-44/+9
* | Merge branch 'master' into careminsterMelanie2011-12-094-12/+13
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| * Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that i...Justin Clark-Casey (justincc)2011-12-091-4/+6
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-091-0/+2
* | Restore the Avination way of position and angle calculation so resizersMelanie2011-12-091-5/+2
* | Fix llGetLinkKey to report avatars properlyMelanie2011-12-091-19/+0
* | Merge branch 'master' into bigmergeMelanie2011-12-097-255/+284
|\ \ | |/
| * Don't reply with an ack packet if the client is not authorized.Justin Clark-Casey (justincc)2011-12-082-45/+31
| * Extend TestAddClient() to check that the first packet received is an ack packetJustin Clark-Casey (justincc)2011-12-083-93/+116
| * Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suiteJustin Clark-Casey (justincc)2011-12-081-1/+1
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-083-109/+138
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-083-16/+9
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-12-082-3/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-089-95/+117
|\ \ | |/
| * When a client connects to a scene, send other avatar appearance data asynchro...Justin Clark-Casey (justincc)2011-12-081-6/+6
| * On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-089-73/+85
| * Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-087-57/+67
|\ \
| * \ Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-087-57/+67
| |\ \ | | |/
| | * 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-071-0/+1
| | |\
| | | * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
| | * | Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-073-3/+42
| | |/
| | * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-072-17/+6
| | * Stop accidentally setting up the UploadTexture caps handler with the same url...Justin Clark-Casey (justincc)2011-12-061-1/+1
* | | Recover from an internal mess-up in the outgoing packet queues by creatingMelanie2011-12-081-19/+36
|/ /
* | 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-061-18/+128
|\ \ | |/
| * 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