ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 09:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,838 Commits 5 Branches 106 Tags
3a26e366d2829c2f66a8aa22158bd0905f0894de
Commit Graph

3515 Commits

Author SHA1 Message Date
Jonathan Freedman
d219317074 Merge branch 'master' into mantis5110 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2010-10-29 23:12:51 -04:00
Melanie
d0895a4a3a On first login, Ruth is back now. Strangely, inventory items are created for 
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
 2010-10-30 03:28:59 +01:00
Melanie
adef6b04cb Logins work now, but avatars are green ugly gnomes. 2010-10-30 02:52:59 +01:00
Melanie
ff7da2082d This commit fixes all the appearance related null refs. Still can't log in, 
client displays a blank error box.
 2010-10-30 02:25:25 +01:00
Melanie
7503c4ad61 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:42 +01:00
Melanie
818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. 
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
 2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc)
e66ec432af Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic 2010-10-29 23:45:10 +01:00
Melanie
934e536738 Merge commit 'cmickeyb/dev-appearance' 2010-10-29 21:06:46 +01:00
Master ScienceSim
f5c9a56c8b Bunch of fixes that reduce the number of times appearance 
and avatar data are sent. And the number of times they
are stored.
 2010-10-29 13:43:35 -07:00
Melanie
5f4badf9e2 Add my work on top of cmickeyb's 2010-10-29 20:44:29 +01:00
Melanie
05d2302c62 Merge branch 'dev-appearance' 2010-10-29 20:24:14 +01:00
Melanie
e6fe83cd93 Revert "Preliminary work on appearance layers. No user functionality yet." 
This work conflicts with cmickeyb's more extensive, related work

This reverts commit 9c829c0410.
 2010-10-29 20:17:59 +01:00
Melanie
9c829c0410 Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:58:22 +01:00
Master ScienceSim
68666efd25 Configuration of persistent baked textures and save/send delays. 2010-10-28 12:00:04 -07:00
Master ScienceSim
f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Master ScienceSim
0f28fa400d Added background thread to handle delayed send and save of appearance 
to accommodate batching of the many updates that happen on login
and teleport.

Fixed handling of the serial property in appearance.
 2010-10-28 09:00:39 -07:00
Master ScienceSim
9cfd3e1d5a Small cleanup and add more debugging information 2010-10-26 12:54:28 -07:00
Master ScienceSim
6e58c3d563 Half of the compatibility is working. Login into a new region with 
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
 2010-10-25 14:11:47 -07:00
Mic Bowman
657cceb884 Intermediate commit for backward compatability; does not compile yet 2010-10-25 09:42:28 -07:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Jonathan Freedman
38e76d71ac Merge branch 'hg16' into mantis5110 2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc)
6d7ce63085 Allow OARs and IARs to save and load meshes. 
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem.  Needs more investigation.
 2010-10-22 18:33:55 -04:00
Master ScienceSim
267f18925d First attempt to get multiple attachments working to support viewer2. 
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
 2010-10-21 16:48:58 -07:00
Melanie
08e14d653e Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance 2010-10-21 17:09:42 +01:00
Jonathan Freedman
017b83d0a3 * remove some spurious debug info 
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think)..    But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs..     I'll sign off on it.

Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-20 22:36:29 -04:00
Jonathan Freedman
58f75fa19d * more url / hg cleanup 2010-10-20 22:21:45 -04:00
Jonathan Freedman
55974df14b * refactor refactor refactor ServerURI 4 lyfe 2010-10-20 22:21:23 -04:00
Master ScienceSim
b1c8d05888 Major refactoring of appearance handling. 
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.

AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.

AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.

AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
 2010-10-20 16:17:54 -07:00
Jonathan Freedman
94684a2251 * remove some spurious debug info 2010-10-20 02:36:59 -04:00
Jonathan Freedman
4e4fb93fae Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-17 18:45:25 -04:00
BlueWall
06b61b68c7 Adding osFunctions for light projection 
Set the projection parameters in the host prim ...
	osSetProjectionParam(bool Enabled,
				key TextureMaskUUID,
				float FOV,
				float Focus,
				float Ambiance);

	Set the projection parameters in a target prim ...
	osSetProjectionParam(ikey target uuid,
				bool Enabled,
				key TextureMaskUUID,
				float FOV,
				float Focus,
				float Ambiance);

	Threat Level very high

Signed-off-by: Melanie <melanie@t-data.com>
 2010-10-17 09:52:12 +01:00
BlueWall
9e421868e3 Add missing check for !_projectionEntry 
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-16 20:59:18 -04:00
BlueWall
dd1058e6b3 Adding projected light filters to prim propeties 
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-15 09:46:49 -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
Melanie
6ac6ca057d Kill some magic numbers in the caps module 2010-10-14 07:28:20 +01: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
Jonathan Freedman
a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Jonathan Freedman
2654ab6300 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-10 18:06:27 -04:00
Justin Clark-Casey (justincc)
ed161020e2 minor: remove some mono compiler warnings 2010-10-09 01:46:29 +01:00
Marck
211ea5d521 Limit formatting of local console output to actual logging messages. 
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
 2010-10-09 00:47:39 +01:00
Jonathan Freedman
8f1acb890a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 14:17:18 -04:00
Diva Canto
0772e19af2 Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there. 2010-10-03 20:01:59 -07:00
Jonathan Freedman
e3099d48f9 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-03 18:04:38 -04:00
Melanie
0b13cfa4dd Port ExecutingDirectory from omfOS Util class. 2010-10-03 16:50:50 +01:00
Jonathan Freedman
32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
Teravus Ovares (Dan Olivares)
27d5976b87 * Tweaked the LocationTests for maximum coverage. 
* Added more mundane tests.
 2010-09-18 03:42:37 -04:00
Teravus Ovares (Dan Olivares)
c203fae26b * Covered the type converters in SLUtil with unit tests. 
* Does anyone have an example raw notecard to look at and test the notecard parser?
 2010-09-18 02:49:42 -04:00
Teravus Ovares (Dan Olivares)
4d83879704 * More Mundane Tests 
* SL Util tests of AssetType2ContentType and ContentType2AssetType
 2010-09-17 23:27:41 -04:00
Marck
cd42cdcc89 REST Console delivers responses with content type text/xml instead of text/plain. 
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
 2010-09-18 02:24:04 +01:00
Justin Clark-Casey (justincc)
2501372d3b Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman 
Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
 2010-09-18 01:57:13 +01:00