ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-09-01 02:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,433 Commits 5 Branches 97 Tags
fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e
Commit Graph

570 Commits

Author SHA1 Message Date
Melanie
fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman
19119d7705 * additional serveruri cleanup 2010-10-20 22:21:41 -04:00
Teravus Ovares (Dan Olivares)
9f975ad5aa * One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately. 2010-10-20 01:23:54 -04:00
Teravus Ovares (Dan Olivares)
edce4e9c67 * This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool. 2010-10-20 00:40:05 -04:00
Teravus Ovares (Dan Olivares)
b2c1a1c9bd * This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization. 
* You should now be able to upload multiple mesh collada mesh objects.  They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
 2010-10-19 01:53:56 -04:00
Teravus Ovares (Dan Olivares)
158e43d4fd * Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment. 2010-10-18 23:47:35 -04:00
Justin Clark-Casey (justincc)
37a6be7ca9 Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it. 2010-10-19 02:20:47 +01:00
Melanie
455a2ba7de Merge branch 'master' into careminster-presence-refactor 2010-10-16 02:27:51 +01:00
Latif Khalifa
cd4d7a7c35 A couple of more ways attachment point is sent 
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-15 01:56:08 -04:00
Teravus Ovares (Dan Olivares)
486eede9be Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-14 12:24:07 -04:00
Teravus Ovares (Dan Olivares)
c148ef25a9 * Replacing Magic numbers with Enums 2010-10-14 12:23:41 -04:00
Latif Khalifa
405935492b Don't distroy attachments when using viewer 2.1+, strip multiple attachment data 2010-10-14 16:28:51 +01:00
Melanie
ba247f729d Kill some magic numbers in the mesh upload module and change the mesh asset 
type from 45 to 49 to match OMV trunk
 2010-10-14 16:28:51 +01:00
Teravus Ovares (Dan Olivares)
05c4e27a30 * A few additional cleanup elements 
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
 2010-10-14 09:57:42 -04:00
Teravus Ovares (Dan Olivares)
6d99f0c627 * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' 
* At this point.   Visually, Mesh works OK.   Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side.   There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed.    Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional.   More work will be done on that.
 2010-10-14 09:34:37 -04:00
Teravus Ovares (Dan Olivares)
7e363b79c7 * Tweaked the upload response and now at least uploading the mesh works. 
* Binary error on downloading the mesh though..   so still not yet working.
 2010-10-14 09:24:15 -04:00
Teravus Ovares (Dan Olivares)
b4a5ce148c Rename file + more testing and tweaking 2010-10-14 03:22:44 -04:00
Teravus Ovares (Dan Olivares)
3384f643eb * Partially complete stuff for Mesh support that Melanie wanted to see before it was done. 
* Shouldn't break the build.
* Doesn't work yet either.
 2010-10-14 02:19:42 -04:00
Melanie
0806d03780 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-10-10 22:08:54 +01:00
Melanie
cb79e228e4 Merge branch 'master' into careminster-presence-refactor 2010-10-10 22:08:36 +01:00
Melanie
c2971a6398 Add group invites to the list of messages that get offlined 2010-10-10 20:15:02 +02:00
Latif Khalifa
0dd4071156 Fix a typo in previouis commit: start must not pass the end of the file 2010-10-09 18:22:21 +02:00
Teravus Ovares (Dan Olivares)
3454dfbcb3 weird line endings fix commit 2010-10-09 12:07:58 -04:00
Latif Khalifa
5e381ec67c Return error code instead of the last byte of the file if range is not satisfiable 2010-10-09 18:01:11 +02:00
Latif Khalifa
06d3a529a9 In case when 1 single byte is requested (yes viewer does this) 
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.

End can also be 0, valid request for the firt byte of the file is 0-0.

Thanks to Thickbrick for explaining how HTTP range header works.
 2010-10-09 17:46:09 +02:00
Melanie
52dd547863 Make SendKillObject send multiple localIDs in one packet. This avoids the 
halting visual behavior of large group deletes and eliminates the packet flood
 2010-10-08 11:31:52 +02:00
Melanie
d8149373c1 Merge branch 'master' into careminster-presence-refactor 2010-10-06 00:27:10 +01:00
Jeff Ames
bc9f793a92 Formatting cleanup. 2010-10-04 21:28:17 -04:00
Melanie
521e2c8355 Merge branch 'master' into careminster-presence-refactor 2010-09-30 16:01:45 +01:00
Melanie
eb58d91098 Prevent dropping someone else's attachments 2010-09-30 15:57:52 +01:00
Melanie
296cf04ce6 Merge branch 'master' into careminster-presence-refactor 2010-09-27 01:32:06 +01:00
Melanie
84ab4742c8 Quash the region ID on intersim messages. That prevents people from determining 
another avatars location
 2010-09-27 01:31:17 +01:00
Melanie
9f17ae580d Merge branch 'master' into careminster-presence-refactor 2010-09-26 23:57:06 +01:00
Melanie
6f78358b09 When receiving intersim IM, don't let the spoof protection bomb 2010-09-26 23:50:55 +01:00
Melanie
0080f28f1d Merge branch 'master' into careminster-presence-refactor 2010-09-25 06:57:53 +01:00
Melanie
d8ae287ebf Prevent spoofing the agent name on text IM 2010-09-25 06:56:08 +01:00
Melanie
9feef34a81 Merge branch 'master' into careminster-presence-refactor 2010-09-21 04:03:14 +01:00
Justin Clark-Casey (justincc)
889923841c Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars 
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
 2010-09-18 01:43:22 +01:00
Melanie
7df4383235 Merge branch 'master' into careminster-presence-refactor 
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
 2010-09-17 03:49:30 +01:00
root
7762301cea Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:57:26 +01:00
John Hurliman
860b2a502f Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection 2010-09-16 17:30:46 -07:00
root
251f2444d0 Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:50:48 +02:00
root
512ded6eb5 Catch a nullref 2010-09-16 21:07:09 +02:00
Melanie
1212cb0c74 Merge branch 'master' into careminster-presence-refactor 2010-09-14 22:03:42 +01:00
Justin Clark-Casey (justincc)
ae1a0150a1 Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory() 2010-09-13 21:15:12 +01:00
Justin Clark-Casey (justincc)
cd153a20b7 Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface 
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
 2010-09-13 21:05:03 +01:00
Justin Clark-Casey (justincc)
366de0a7b5 If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory 
Doing this results in a null reference exception
 2010-09-13 20:58:50 +01:00
Justin Clark-Casey (justincc)
ff098ae110 minor: Clean up log messages generated when an item is attached 2010-09-13 20:44:32 +01:00
John Hurliman
5ef2da39d8 * Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers) 2010-09-13 11:23:45 -07:00
Melanie
6a1ce17cdb Merge branch 'master' into careminster-presence-refactor 
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
 2010-09-13 16:17:38 +01:00